diff options
| author | Nikos <nmav@crystal.(none)> | 2008-01-14 21:54:52 +0200 |
|---|---|---|
| committer | Nikos <nmav@crystal.(none)> | 2008-01-14 21:54:52 +0200 |
| commit | 4036aa2db0d4b3ee710cac2544c78dad8aea7e70 (patch) | |
| tree | 7969396a9ffd96898f98d013f1ebe2d6a3246a9e | |
| parent | 62a154c71d1963c50edeb9b882c5100caa8b6751 (diff) | |
| download | gnutls-4036aa2db0d4b3ee710cac2544c78dad8aea7e70.tar.gz | |
rolled back changes.
| -rw-r--r-- | libextra/gnutls_openpgp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c index 4503b2253c..026aad7982 100644 --- a/libextra/gnutls_openpgp.c +++ b/libextra/gnutls_openpgp.c @@ -210,8 +210,7 @@ _gnutls_openpgp_raw_privkey_to_gkey (gnutls_privkey * pkey, goto leave; } - pkt = cdk_kbnode_find_packet (snode, CDK_PKT_SECRET_SUBKEY); - if (!pkt) pkt = cdk_kbnode_find_packet (snode, CDK_PKT_SECRET_KEY); + pkt = cdk_kbnode_find_packet (snode, CDK_PKT_SECRET_KEY); if (!pkt) { rc = GNUTLS_E_OPENPGP_GETKEY_FAILED; @@ -286,8 +285,7 @@ _gnutls_openpgp_raw_key_to_gcert (gnutls_cert * cert, rc = cdk_kbnode_read_from_mem (&knode, raw->data, raw->size); if (!(rc = _gnutls_map_cdk_rc (rc))) { - pkt = cdk_kbnode_find_packet (knode, CDK_PKT_PUBLIC_SUBKEY); - if (!pkt) pkt = cdk_kbnode_find_packet (knode, CDK_PKT_PUBLIC_KEY); + pkt = cdk_kbnode_find_packet (knode, CDK_PKT_PUBLIC_KEY); } if (!pkt) { |