summaryrefslogtreecommitdiff
path: root/libextra/openpgp/openpgp.h
diff options
context:
space:
mode:
Diffstat (limited to 'libextra/openpgp/openpgp.h')
-rw-r--r--libextra/openpgp/openpgp.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/libextra/openpgp/openpgp.h b/libextra/openpgp/openpgp.h
index c6177c2675..5d1bdde777 100644
--- a/libextra/openpgp/openpgp.h
+++ b/libextra/openpgp/openpgp.h
@@ -6,11 +6,11 @@
#endif
/* The format the OpenPGP key is stored in. */
-typedef enum gnutls_openpgp_key_fmt_t
+typedef enum gnutls_openpgp_cert_fmt_t
{
GNUTLS_OPENPGP_FMT_RAW,
GNUTLS_OPENPGP_FMT_BASE64
-} gnutls_openpgp_key_fmt_t;
+} gnutls_openpgp_cert_fmt_t;
#ifdef ENABLE_OPENPGP
@@ -40,42 +40,42 @@ typedef struct gnutls_openpgp_keyring_int
typedef struct gnutls_openpgp_keyring_int *gnutls_openpgp_keyring_t;
int _gnutls_map_cdk_rc (int rc);
-int gnutls_openpgp_key_get_name (gnutls_openpgp_cert_t key,
+int gnutls_openpgp_cert_get_name (gnutls_openpgp_cert_t key,
int idx, char *buf, size_t * sizeof_buf);
-int gnutls_openpgp_key_get_fingerprint (gnutls_openpgp_cert_t key,
+int gnutls_openpgp_cert_get_fingerprint (gnutls_openpgp_cert_t key,
void *fpr, size_t * fprlen);
gnutls_pk_algorithm_t
-gnutls_openpgp_key_get_pk_algorithm (gnutls_openpgp_cert_t key,
+gnutls_openpgp_cert_get_pk_algorithm (gnutls_openpgp_cert_t key,
unsigned int *bits);
-int gnutls_openpgp_key_get_version (gnutls_openpgp_cert_t key);
-time_t gnutls_openpgp_key_get_creation_time (gnutls_openpgp_cert_t key);
-time_t gnutls_openpgp_key_get_expiration_time (gnutls_openpgp_cert_t key);
-int gnutls_openpgp_key_get_id (gnutls_openpgp_cert_t key,
+int gnutls_openpgp_cert_get_version (gnutls_openpgp_cert_t key);
+time_t gnutls_openpgp_cert_get_creation_time (gnutls_openpgp_cert_t key);
+time_t gnutls_openpgp_cert_get_expiration_time (gnutls_openpgp_cert_t key);
+int gnutls_openpgp_cert_get_id (gnutls_openpgp_cert_t key,
unsigned char keyid[8]);
-int gnutls_openpgp_key_init (gnutls_openpgp_cert_t * key);
-void gnutls_openpgp_key_deinit (gnutls_openpgp_cert_t key);
-int gnutls_openpgp_key_import (gnutls_openpgp_cert_t key,
+int gnutls_openpgp_cert_init (gnutls_openpgp_cert_t * key);
+void gnutls_openpgp_cert_deinit (gnutls_openpgp_cert_t key);
+int gnutls_openpgp_cert_import (gnutls_openpgp_cert_t key,
const gnutls_datum_t * data,
- gnutls_openpgp_key_fmt_t format);
-int gnutls_openpgp_key_export (gnutls_openpgp_cert_t key,
- gnutls_openpgp_key_fmt_t format,
+ gnutls_openpgp_cert_fmt_t format);
+int gnutls_openpgp_cert_export (gnutls_openpgp_cert_t key,
+ gnutls_openpgp_cert_fmt_t format,
void *output_data, size_t * output_data_size);
void gnutls_openpgp_keyring_deinit (gnutls_openpgp_keyring_t keyring);
int gnutls_openpgp_keyring_init (gnutls_openpgp_keyring_t * keyring);
int gnutls_openpgp_keyring_import (gnutls_openpgp_keyring_t keyring,
const gnutls_datum_t * data,
- gnutls_openpgp_key_fmt_t format);
+ gnutls_openpgp_cert_fmt_t format);
int gnutls_openpgp_keyring_check_id (gnutls_openpgp_keyring_t ring,
const unsigned char keyid[8],
unsigned int flags);
-int gnutls_openpgp_key_verify_ring (gnutls_openpgp_cert_t key,
+int gnutls_openpgp_cert_verify_ring (gnutls_openpgp_cert_t key,
gnutls_openpgp_keyring_t keyring,
unsigned int flags, unsigned int *verify);
-int gnutls_openpgp_key_verify_self (gnutls_openpgp_cert_t key,
+int gnutls_openpgp_cert_verify_self (gnutls_openpgp_cert_t key,
unsigned int flags, unsigned int *verify);
int _gnutls_openpgp_cert_to_gcert (gnutls_cert * gcert,