summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2014-01-20 09:58:01 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2014-01-20 09:58:01 +0100
commit47f86171286c116bed57def79a3c38412064c204 (patch)
treef79f1417bf3713a1c238902323cd4044839ff0e2
parent106dd237887c0dc7e6120969ce27a0988cce401c (diff)
downloadgnutls-47f86171286c116bed57def79a3c38412064c204.tar.gz
always set subkey status
-rw-r--r--lib/gnutls_pubkey.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 019704f7c8..fce376c244 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -521,8 +521,13 @@ gnutls_pubkey_get_openpgp_key_id (gnutls_pubkey_t key, unsigned int flags,
if (key->openpgp_key_id_set == 0)
return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
- if (key->openpgp_key_id_set == OPENPGP_KEY_SUBKEY)
- if (subkey) *subkey = 1;
+ if (subkey)
+ {
+ if (key->openpgp_key_id_set == OPENPGP_KEY_SUBKEY)
+ *subkey = 1;
+ else
+ *subkey = 0;
+ }
if (output_data)
{