diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/gnutls/compat.h | 1 | ||||
| -rw-r--r-- | includes/gnutls/extra.h | 3 | ||||
| -rw-r--r-- | includes/gnutls/gnutls.h.in | 1 | ||||
| -rw-r--r-- | includes/gnutls/openpgp.h | 18 |
4 files changed, 0 insertions, 23 deletions
diff --git a/includes/gnutls/compat.h b/includes/gnutls/compat.h index eab5442262..e3df741ca2 100644 --- a/includes/gnutls/compat.h +++ b/includes/gnutls/compat.h @@ -31,7 +31,6 @@ #define gnutls_openpgp_key gnutls_openpgp_key_t #define gnutls_openpgp_privkey gnutls_openpgp_privkey_t #define gnutls_openpgp_keyring gnutls_openpgp_keyring_t -#define gnutls_openpgp_trustdb gnutls_openpgp_trustdb_t #define gnutls_x509_crt gnutls_x509_crt_t #define gnutls_x509_privkey gnutls_x509_privkey_t #define gnutls_x509_crl gnutls_x509_crl_t diff --git a/includes/gnutls/extra.h b/includes/gnutls/extra.h index 55e5a76317..f7c7bd998b 100644 --- a/includes/gnutls/extra.h +++ b/includes/gnutls/extra.h @@ -77,9 +77,6 @@ extern "C" res, const char *keyserver, int port); - int gnutls_certificate_set_openpgp_trustdb (gnutls_certificate_credentials_t - res, const char *trustdb); - int gnutls_certificate_set_openpgp_keyring_mem (gnutls_certificate_credentials_t c, const unsigned char *data, diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in index 01997cd1d6..34fb28bbcd 100644 --- a/includes/gnutls/gnutls.h.in +++ b/includes/gnutls/gnutls.h.in @@ -1257,7 +1257,6 @@ extern "C" #define GNUTLS_E_ASN1_TYPE_ANY_ERROR -75 #define GNUTLS_E_ASN1_SYNTAX_ERROR -76 #define GNUTLS_E_ASN1_DER_OVERFLOW -77 -#define GNUTLS_E_OPENPGP_TRUSTDB_VERSION_UNSUPPORTED -81 #define GNUTLS_E_OPENPGP_UID_REVOKED -79 #define GNUTLS_E_CERTIFICATE_ERROR -43 #define GNUTLS_E_X509_CERTIFICATE_ERROR GNUTLS_E_CERTIFICATE_ERROR diff --git a/includes/gnutls/openpgp.h b/includes/gnutls/openpgp.h index 5b2761068b..2393ab1967 100644 --- a/includes/gnutls/openpgp.h +++ b/includes/gnutls/openpgp.h @@ -115,17 +115,6 @@ extern "C" const unsigned char keyid[8], unsigned int flags); -/* Trustdb functions. - */ - struct gnutls_openpgp_trustdb_int; /* object to hold (parsed) openpgp trustdbs */ - typedef struct gnutls_openpgp_trustdb_int *gnutls_openpgp_trustdb_t; - - int gnutls_openpgp_trustdb_init (gnutls_openpgp_trustdb_t * trustdb); - void gnutls_openpgp_trustdb_deinit (gnutls_openpgp_trustdb_t trustdb); - - int gnutls_openpgp_trustdb_import (gnutls_openpgp_trustdb_t trustdb, - const char *file); - int gnutls_openpgp_key_verify_ring (gnutls_openpgp_key_t key, gnutls_openpgp_keyring_t keyring, @@ -136,13 +125,6 @@ extern "C" unsigned int flags, unsigned int *verify); - int gnutls_openpgp_key_verify_trustdb (gnutls_openpgp_key_t key, - gnutls_openpgp_trustdb_t trustdb, - unsigned int flags, - unsigned int *verify - /* the output of the verification */ - ); - /* certificate authentication stuff. */ |