diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-12-08 10:48:13 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-12-08 10:48:13 +0100 |
| commit | 4c95a73caeafb8c0cfa928dd412763c2b98c0abe (patch) | |
| tree | 4b97be755e1e154a762367a8617e3015f4936518 /lib/pkcs11_privkey.c | |
| parent | b0f03a3eb32ffff67984faeb605b3e1fcfd0ebc9 (diff) | |
| download | gnutls-4c95a73caeafb8c0cfa928dd412763c2b98c0abe.tar.gz | |
Revert "Do not allow importing public keys from PKCS #11 private keys for DSA and ECDSA"
This reverts commit 5a4e692511dc3a829eda0d7c5a87e56cbc2055f0.
Diffstat (limited to 'lib/pkcs11_privkey.c')
| -rw-r--r-- | lib/pkcs11_privkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c index 887ba073cd..a512534edc 100644 --- a/lib/pkcs11_privkey.c +++ b/lib/pkcs11_privkey.c @@ -959,7 +959,7 @@ gnutls_pkcs11_privkey_generate3(const char *url, gnutls_pk_algorithm_t pk, obj->type = GNUTLS_PKCS11_OBJ_PUBKEY; ret = pkcs11_read_pubkey(sinfo.module, sinfo.pks, pub, - key_type, obj, 0); + key_type, obj); if (ret < 0) { gnutls_assert(); goto cleanup; @@ -1021,7 +1021,7 @@ _pkcs11_privkey_get_pubkey (gnutls_pkcs11_privkey_t pkey, gnutls_pubkey_t *pub, obj->pk_algorithm = gnutls_pkcs11_privkey_get_pk_algorithm(pkey, 0); obj->type = GNUTLS_PKCS11_OBJ_PUBKEY; pk_to_genmech(obj->pk_algorithm, &key_type); - ret = pkcs11_read_pubkey(pkey->sinfo.module, pkey->sinfo.pks, pkey->ref, key_type, obj, 1); + ret = pkcs11_read_pubkey(pkey->sinfo.module, pkey->sinfo.pks, pkey->ref, key_type, obj); if (ret < 0) { gnutls_assert(); goto cleanup; |