diff options
| author | Simon Josefsson <simon@josefsson.org> | 2008-02-21 11:26:52 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2008-02-21 11:26:52 +0100 |
| commit | f70be662d54b075394099b0182494c3b17a6c725 (patch) | |
| tree | e48b159165c9ffcd8bba05feb1238cfd4a8985fc | |
| parent | 0d9e0e07aa18981ff01ac67360a3feb1f4410078 (diff) | |
| download | gnutls-f70be662d54b075394099b0182494c3b17a6c725.tar.gz | |
Cleanup gnutls_openpgp_crt_get_id vs gnutls_openpgp_crt_get_key_id.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | includes/gnutls/compat.h | 3 | ||||
| -rw-r--r-- | lib/openpgp/pgp.c | 15 |
3 files changed, 4 insertions, 18 deletions
@@ -45,9 +45,7 @@ gnutls_certificate_export_x509_cas: ADDED gnutls_certificate_export_x509_crls: ADDED gnutls_certificate_export_openpgp_keyring: ADDED gnutls_openpgp_keyid_t: ADDED, instead of hard-coded 'unsigned char[8]'. -gnutls_openpgp_crt_get_key_id: ADDED to account for new keyid type, - obsoletes gnutls_openpgp_crt_get_id(). -gnutls_openpgp_privkey_get_id: RENAMED to gnutls_openpgp_privkey_get_key_id +gnutls_openpgp_crt_get_key_id: ADDED, obsoletes gnutls_openpgp_crt_get_id. gnutls_openpgp_crt_get_revoked_status: ADDED gnutls_openpgp_crt_get_subkey_count: ADDED gnutls_openpgp_crt_get_subkey_idx: ADDED diff --git a/includes/gnutls/compat.h b/includes/gnutls/compat.h index ee23e49ad2..a60e8fedc1 100644 --- a/includes/gnutls/compat.h +++ b/includes/gnutls/compat.h @@ -93,4 +93,7 @@ #define gnutls_openpgp_key_get_id gnutls_openpgp_crt_get_id #define gnutls_openpgp_key_check_hostname gnutls_openpgp_crt_check_hostname +/* OpenPGP stuff renamed in 2.2.x. */ +#define gnutls_openpgp_crt_get_id gnutls_openpgp_crt_get_key_id + #endif /* GCOMPAT_H */ diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c index 1775569ed6..7b07e319b3 100644 --- a/lib/openpgp/pgp.c +++ b/lib/openpgp/pgp.c @@ -471,21 +471,6 @@ gnutls_openpgp_crt_get_key_id (gnutls_openpgp_crt_t key, gnutls_openpgp_keyid_t return 0; } -/*- - * gnutls_openpgp_crt_get_id - Gets the keyID - * @key: the structure that contains the OpenPGP public key. - * @keyid: the buffer to save the keyid. - * - * Returns the 64-bit keyID of the OpenPGP key. - * - * Deprecated: Use gnutls_openpgp_crt_get_key_id() instead. - -*/ -int -gnutls_openpgp_crt_get_id (gnutls_openpgp_crt_t key, unsigned char keyid[8]) -{ - return gnutls_openpgp_crt_get_key_id( key, keyid); -} - /** * gnutls_openpgp_crt_get_revoked_status - Gets the revoked status of the key * @key: the structure that contains the OpenPGP public key. |