diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-10-11 20:47:46 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-10-11 22:05:44 +0200 |
| commit | 00ff88629c1c8a391a0515e87e5cd98259b77c6c (patch) | |
| tree | fc30a7c610d0b6e4831cb29f3da54b15fb4ea26c /lib/gnutls_pubkey.c | |
| parent | 3a8d9b33d8bf9d5fb53f051e92db5d4d88fc1f90 (diff) | |
| download | gnutls-00ff88629c1c8a391a0515e87e5cd98259b77c6c.tar.gz | |
Several OpenPGP updates.
Exported gnutls_certificate_get_peers_subkey_id().
Removed compatibility code with RFC5081.
The gnutls_openpgp_*_get_subkey_*() functions return the master key parameters if provided with GNUTLS_OPENPGP_MASTER_KEYID_IDX.
Diffstat (limited to 'lib/gnutls_pubkey.c')
| -rw-r--r-- | lib/gnutls_pubkey.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c index c492445e94..253b72249e 100644 --- a/lib/gnutls_pubkey.c +++ b/lib/gnutls_pubkey.c @@ -420,14 +420,13 @@ gnutls_pubkey_import_openpgp (gnutls_pubkey_t key, * replaced by the actual size of parameters) * @subkey: Will be non zero if the key ID corresponds to a subkey * - * This function will return a unique ID the depends on the public - * key parameters. This ID can be used in checking whether a - * certificate corresponds to the given public key. + * This function returned the OpenPGP key ID of the corresponding key. + * The key is a unique ID the depends on the public + * key parameters. * * If the buffer provided is not long enough to hold the output, then * *output_data_size is updated and %GNUTLS_E_SHORT_MEMORY_BUFFER will - * be returned. The output will normally be a SHA-1 hash output, - * which is 20 bytes. + * be returned. The output is %GNUTLS_OPENPGP_KEYID_SIZE bytes long. * * Returns: In case of failure a negative error code will be * returned, and 0 on success. |