diff options
Diffstat (limited to 'lib/pcert.c')
| -rw-r--r-- | lib/pcert.c | 193 |
1 files changed, 0 insertions, 193 deletions
diff --git a/lib/pcert.c b/lib/pcert.c index 3fdce92017..56322e124c 100644 --- a/lib/pcert.c +++ b/lib/pcert.c @@ -26,9 +26,6 @@ #include <x509/common.h> #include <x509.h> #include "x509/x509_int.h" -#ifdef ENABLE_OPENPGP -#include "openpgp/openpgp.h" -#endif /** * gnutls_pcert_import_x509: @@ -270,142 +267,6 @@ int gnutls_pcert_import_x509_raw(gnutls_pcert_st * pcert, return ret; } -#ifdef ENABLE_OPENPGP - -/** - * gnutls_pcert_import_openpgp: - * @pcert: The pcert structure - * @crt: The raw certificate to be imported - * @flags: zero for now - * - * This convenience function will import the given certificate to a - * #gnutls_pcert_st structure. The structure must be deinitialized - * afterwards using gnutls_pcert_deinit(); - * - * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a - * negative error value. - * - * Since: 3.0 - **/ -int gnutls_pcert_import_openpgp(gnutls_pcert_st * pcert, - gnutls_openpgp_crt_t crt, - unsigned int flags) -{ - int ret; - size_t sz; - - memset(pcert, 0, sizeof(*pcert)); - - pcert->type = GNUTLS_CRT_OPENPGP; - pcert->cert.data = NULL; - - sz = 0; - ret = - gnutls_openpgp_crt_export(crt, GNUTLS_OPENPGP_FMT_RAW, NULL, - &sz); - if (ret < 0 && ret != GNUTLS_E_SHORT_MEMORY_BUFFER) { - ret = gnutls_assert_val(ret); - goto cleanup; - } - - pcert->cert.data = gnutls_malloc(sz); - if (pcert->cert.data == NULL) { - ret = gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); - goto cleanup; - } - - ret = - gnutls_openpgp_crt_export(crt, GNUTLS_OPENPGP_FMT_RAW, - pcert->cert.data, &sz); - if (ret < 0) { - ret = gnutls_assert_val(ret); - goto cleanup; - } - pcert->cert.size = sz; - - ret = gnutls_pubkey_init(&pcert->pubkey); - if (ret < 0) { - ret = gnutls_assert_val(ret); - goto cleanup; - } - - ret = gnutls_pubkey_import_openpgp(pcert->pubkey, crt, 0); - if (ret < 0) { - gnutls_pubkey_deinit(pcert->pubkey); - pcert->pubkey = NULL; - ret = gnutls_assert_val(ret); - goto cleanup; - } - - return 0; - - cleanup: - _gnutls_free_datum(&pcert->cert); - - return ret; -} - -/** - * gnutls_pcert_import_openpgp_raw: - * @pcert: The pcert structure - * @cert: The raw certificate to be imported - * @format: The format of the certificate - * @keyid: The key ID to use (NULL for the master key) - * @flags: zero for now - * - * This convenience function will import the given certificate to a - * #gnutls_pcert_st structure. The structure must be deinitialized - * afterwards using gnutls_pcert_deinit(); - * - * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a - * negative error value. - * - * Since: 3.0 - **/ -int gnutls_pcert_import_openpgp_raw(gnutls_pcert_st * pcert, - const gnutls_datum_t * cert, - gnutls_openpgp_crt_fmt_t format, - gnutls_openpgp_keyid_t keyid, - unsigned int flags) -{ - int ret; - gnutls_openpgp_crt_t crt; - - memset(pcert, 0, sizeof(*pcert)); - - pcert->cert.data = NULL; - - ret = gnutls_openpgp_crt_init(&crt); - if (ret < 0) - return gnutls_assert_val(ret); - - ret = gnutls_openpgp_crt_import(crt, cert, format); - if (ret < 0) { - ret = gnutls_assert_val(ret); - goto cleanup; - } - - ret = gnutls_openpgp_crt_set_preferred_key_id(crt, keyid); - if (ret < 0) { - ret = gnutls_assert_val(ret); - goto cleanup; - } - - ret = gnutls_pcert_import_openpgp(pcert, crt, flags); - if (ret < 0) { - ret = gnutls_assert_val(ret); - goto cleanup; - } - ret = 0; - - cleanup: - gnutls_openpgp_crt_deinit(crt); - - return ret; -} - -#endif - /** * gnutls_pcert_export_x509: * @pcert: The pcert structure. @@ -446,50 +307,6 @@ int gnutls_pcert_export_x509(gnutls_pcert_st * pcert, return 0; } -#ifdef ENABLE_OPENPGP - -/** - * gnutls_pcert_export_x509: - * @pcert: The pcert structure. - * @crt: An initialized #gnutls_openpgp_crt_t. - * - * Converts the given #gnutls_pcert_t type into a #gnutls_openpgp_crt_t. - * This function only works if the type of @pcert is %GNUTLS_CRT_OPENPGP. - * When successful, the value written to @crt must be freed with - * gnutls_openpgp_crt_deinit() when no longer needed. - * - * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a - * negative error value. - * - * Since: 3.4.0 - */ -int gnutls_pcert_export_openpgp(gnutls_pcert_st * pcert, - gnutls_openpgp_crt_t * crt) -{ - int ret; - - if (pcert->type != GNUTLS_CRT_OPENPGP) { - gnutls_assert(); - return GNUTLS_E_INVALID_REQUEST; - } - - ret = gnutls_openpgp_crt_init(crt); - if (ret < 0) - return gnutls_assert_val(ret); - - ret = gnutls_openpgp_crt_import(*crt, &pcert->cert, GNUTLS_OPENPGP_FMT_RAW); - if (ret < 0) { - gnutls_openpgp_crt_deinit(*crt); - *crt = NULL; - - return gnutls_assert_val(ret); - } - - return 0; -} - -#endif - /** * gnutls_pcert_deinit: * @pcert: The structure to be deinitialized @@ -521,16 +338,6 @@ _gnutls_get_auth_info_pcert(gnutls_pcert_st * pcert, [0], GNUTLS_X509_FMT_DER, GNUTLS_PCERT_NO_CERT); -#ifdef ENABLE_OPENPGP - case GNUTLS_CRT_OPENPGP: - return gnutls_pcert_import_openpgp_raw(pcert, - &info-> - raw_certificate_list - [0], - GNUTLS_OPENPGP_FMT_RAW, - info->subkey_id, - GNUTLS_PCERT_NO_CERT); -#endif default: gnutls_assert(); return GNUTLS_E_INTERNAL_ERROR; |