diff options
| author | Nikos <nmav@crystal.(none)> | 2008-01-14 21:27:49 +0200 |
|---|---|---|
| committer | Nikos <nmav@crystal.(none)> | 2008-01-14 21:27:49 +0200 |
| commit | ecc8945d6535d47f08177ef545a9aff52063dff7 (patch) | |
| tree | 5a1cc7b9d4a2b4b23b5077400333c5adc7389ade | |
| parent | 53cf4d59ccc0195cd169ea9e028d3de06c1e9e2d (diff) | |
| download | gnutls-ecc8945d6535d47f08177ef545a9aff52063dff7.tar.gz | |
reverted the addition of gnutls_openpgp_get_key_id().
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | includes/gnutls/openpgp.h | 2 | ||||
| -rw-r--r-- | libextra/openpgp/pgp.c | 18 |
3 files changed, 2 insertions, 21 deletions
@@ -14,9 +14,6 @@ in a callback friendly way. ** Fix for certificate selection in servers with certificate callbacks. -** API and ABI modifications: -gnutls_openpgp_crt_get_key_id: ADDED for future compatibility - * Version 2.2.0 (released 2007-12-14) ** Update internal copy of libtasn1 to version 1.2. diff --git a/includes/gnutls/openpgp.h b/includes/gnutls/openpgp.h index 435f0b0fbb..fae404c8a8 100644 --- a/includes/gnutls/openpgp.h +++ b/includes/gnutls/openpgp.h @@ -75,8 +75,6 @@ extern "C" int gnutls_openpgp_crt_get_id (gnutls_openpgp_crt_t key, unsigned char keyid[8]); - int gnutls_openpgp_crt_get_key_id (gnutls_openpgp_crt_t key, - unsigned char keyid[8]); int gnutls_openpgp_crt_check_hostname (gnutls_openpgp_crt_t key, const char *hostname); diff --git a/libextra/openpgp/pgp.c b/libextra/openpgp/pgp.c index 0721b69aaa..269cec521c 100644 --- a/libextra/openpgp/pgp.c +++ b/libextra/openpgp/pgp.c @@ -436,14 +436,14 @@ gnutls_openpgp_crt_get_expiration_time (gnutls_openpgp_crt_t key) } /** - * gnutls_openpgp_crt_get_key_id - Gets the keyID + * 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. **/ int -gnutls_openpgp_crt_get_key_id (gnutls_openpgp_crt_t key, unsigned char keyid[8]) +gnutls_openpgp_crt_get_id (gnutls_openpgp_crt_t key, unsigned char keyid[8]) { cdk_packet_t pkt; uint32_t kid[2]; @@ -472,20 +472,6 @@ gnutls_openpgp_crt_get_key_id (gnutls_openpgp_crt_t key, unsigned char keyid[8]) } /** - * 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. - **/ -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_check_hostname - This function compares the given hostname with the hostname in the key * @key: should contain an gnutls_openpgp_crt_t structure * @hostname: A null terminated string that contains a DNS name |