diff options
| author | Wan-Teh Chang <wtc@google.com> | 2013-04-01 17:56:19 -0700 |
|---|---|---|
| committer | Wan-Teh Chang <wtc@google.com> | 2013-04-01 17:56:19 -0700 |
| commit | 836556035690815ce2a7cc5d12b24fdf3902cdbd (patch) | |
| tree | 312fc1d1a2aff082837676bea9aa956febb7fbd3 | |
| parent | 79bac1ce81a4213dcfcf2fc6880ae413a244acd6 (diff) | |
| download | nss-hg-836556035690815ce2a7cc5d12b24fdf3902cdbd.tar.gz | |
Bug 838767: Allow lib/pkcs7 and lib/smime to verify ECDSA signatures.
r=rrelyea.
| -rw-r--r-- | lib/pkcs7/p7decode.c | 9 | ||||
| -rw-r--r-- | lib/smime/cmssiginfo.c | 7 |
2 files changed, 0 insertions, 16 deletions
diff --git a/lib/pkcs7/p7decode.c b/lib/pkcs7/p7decode.c index 9a07b51eb..93e61f7aa 100644 --- a/lib/pkcs7/p7decode.c +++ b/lib/pkcs7/p7decode.c @@ -1518,14 +1518,6 @@ sec_pkcs7_verify_signature(SEC_PKCS7ContentInfo *cinfo, goto done; } -#ifndef NSS_ECC_MORE_THAN_SUITE_B - if (encTag == SEC_OID_ANSIX962_EC_PUBLIC_KEY) { - PORT_SetError(SEC_ERROR_PKCS7_BAD_SIGNATURE); - goto done; - } -#endif - - if (signerinfo->authAttr != NULL) { SEC_PKCS7Attribute *attr; SECItem *value; @@ -1590,7 +1582,6 @@ sec_pkcs7_verify_signature(SEC_PKCS7ContentInfo *cinfo, goto done; } - goodsig = (PRBool)(VFY_VerifyDataDirect(encoded_attrs.data, encoded_attrs.len, publickey, &(signerinfo->encDigest), diff --git a/lib/smime/cmssiginfo.c b/lib/smime/cmssiginfo.c index effac244b..59b947f4f 100644 --- a/lib/smime/cmssiginfo.c +++ b/lib/smime/cmssiginfo.c @@ -348,13 +348,6 @@ NSS_CMSSignerInfo_Verify(NSSCMSSignerInfo *signerinfo, goto loser; } -#ifndef NSS_ECC_MORE_THAN_SUITE_B - if (pubkAlgTag == SEC_OID_ANSIX962_EC_PUBLIC_KEY) { - vs = NSSCMSVS_SignatureAlgorithmUnknown; - goto loser; - } -#endif - if (!NSS_CMSArray_IsEmpty((void **)signerinfo->authAttr)) { if (contentType) { /* |