diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-07-18 15:58:00 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-07-18 15:58:00 +0200 |
| commit | 2539ce925195a9524521c5d87fd3441d964d03d3 (patch) | |
| tree | 00fd2cf658129d6c30e1dbb4f9c54d83321157db /security/nss/lib/pk11wrap/pk11cert.c | |
| parent | ca0083022fad1f9fb2a7b1d4b94f32402026e3e6 (diff) | |
| parent | 89bd45bf91e0611449a93cbc978bdd6654109c46 (diff) | |
| download | UXP-2539ce925195a9524521c5d87fd3441d964d03d3.tar UXP-2539ce925195a9524521c5d87fd3441d964d03d3.tar.gz UXP-2539ce925195a9524521c5d87fd3441d964d03d3.tar.lz UXP-2539ce925195a9524521c5d87fd3441d964d03d3.tar.xz UXP-2539ce925195a9524521c5d87fd3441d964d03d3.zip | |
Merge branch 'nss-work'
Diffstat (limited to 'security/nss/lib/pk11wrap/pk11cert.c')
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11cert.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/nss/lib/pk11wrap/pk11cert.c b/security/nss/lib/pk11wrap/pk11cert.c index 819769643..a880b1ab8 100644 --- a/security/nss/lib/pk11wrap/pk11cert.c +++ b/security/nss/lib/pk11wrap/pk11cert.c @@ -184,7 +184,9 @@ PK11_IsUserCert(PK11SlotInfo *slot, CERTCertificate *cert, SECKEY_DestroyPublicKey(pubKey); return PR_FALSE; } - pk11_SignedToUnsigned(&theTemplate); + if (pubKey->keyType != ecKey) { + pk11_SignedToUnsigned(&theTemplate); + } if (pk11_FindObjectByTemplate(slot, &theTemplate, 1) != CK_INVALID_HANDLE) { SECKEY_DestroyPublicKey(pubKey); return PR_TRUE; |