diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-02-29 16:55:41 +0100 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-02-29 16:55:41 +0100 |
| commit | fafaa2c3947a492a780293559fb07efe8a02002e (patch) | |
| tree | 1ef58cf37f7c1dc24a37666ff4e075c3bf867714 | |
| parent | f6b1b5dafd2bc1da2689521772d9efd8919b8002 (diff) | |
| download | nss-hg-fafaa2c3947a492a780293559fb07efe8a02002e.tar.gz | |
Bug671097 - don't call SECKEY_UpdateCertPQG in CERT_ExtractPublicKey, r=rrelyea,kaieNSS_3_24_BETA7
| -rw-r--r-- | lib/cryptohi/seckey.c | 10 | ||||
| -rwxr-xr-x | tests/pkits/pkits.sh | 19 |
2 files changed, 10 insertions, 19 deletions
diff --git a/lib/cryptohi/seckey.c b/lib/cryptohi/seckey.c index 827413a70..e347714a2 100644 --- a/lib/cryptohi/seckey.c +++ b/lib/cryptohi/seckey.c @@ -660,16 +660,6 @@ SECKEY_ExtractPublicKey(const CERTSubjectPublicKeyInfo *spki) SECKEYPublicKey * CERT_ExtractPublicKey(CERTCertificate *cert) { - SECStatus rv; - - if (!cert) { - PORT_SetError(SEC_ERROR_INVALID_ARGS); - return NULL; - } - rv = SECKEY_UpdateCertPQG(cert); - if (rv != SECSuccess) - return NULL; - return seckey_ExtractPublicKey(&cert->subjectPublicKeyInfo); } diff --git a/tests/pkits/pkits.sh b/tests/pkits/pkits.sh index a2166e6fa..ecf007736 100755 --- a/tests/pkits/pkits.sh +++ b/tests/pkits/pkits.sh @@ -310,15 +310,16 @@ pkits_SignatureVerification() pkits $certs/ValidDSASignaturesTest4EE.crt $certs/DSACACert.crt restore_db - VFY_ACTION="Valid DSA Parameter Inheritance Test5"; log_banner - certImport DSACACert - crlImport DSACACRL.crl - certImport DSAParametersInheritedCACert - crlImport DSAParametersInheritedCACRL.crl - pkits $certs/ValidDSAParameterInheritanceTest5EE.crt \ - $certs/DSAParametersInheritedCACert.crt \ - $certs/DSACACert.crt - restore_db + # NSS doesn't support DSA parameter inheritance anymore (see bug 671097) + # VFY_ACTION="Valid DSA Parameter Inheritance Test5"; log_banner + # certImport DSACACert + # crlImport DSACACRL.crl + # certImport DSAParametersInheritedCACert + # crlImport DSAParametersInheritedCACRL.crl + # pkits $certs/ValidDSAParameterInheritanceTest5EE.crt \ + # $certs/DSAParametersInheritedCACert.crt \ + # $certs/DSACACert.crt + # restore_db VFY_ACTION="Invalid DSA Signature Test6"; log_banner certImport DSACACert |