summaryrefslogtreecommitdiff
path: root/lib/gnutls_pcert.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2012-10-11 20:47:46 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2012-10-11 22:05:44 +0200
commit00ff88629c1c8a391a0515e87e5cd98259b77c6c (patch)
treefc30a7c610d0b6e4831cb29f3da54b15fb4ea26c /lib/gnutls_pcert.c
parent3a8d9b33d8bf9d5fb53f051e92db5d4d88fc1f90 (diff)
downloadgnutls-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_pcert.c')
-rw-r--r--lib/gnutls_pcert.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gnutls_pcert.c b/lib/gnutls_pcert.c
index 1211e2d6fb..3a6b6fee5c 100644
--- a/lib/gnutls_pcert.c
+++ b/lib/gnutls_pcert.c
@@ -396,8 +396,7 @@ _gnutls_get_auth_info_pcert (gnutls_pcert_st* pcert,
return gnutls_pcert_import_openpgp_raw(pcert,
&info->raw_certificate_list[0],
GNUTLS_OPENPGP_FMT_RAW,
- info->use_subkey ? info->
- subkey_id : NULL, GNUTLS_PCERT_NO_CERT);
+ info->subkey_id, GNUTLS_PCERT_NO_CERT);
#endif
default:
gnutls_assert ();