Bug 1366464 - compare signature and signatureAlgorithm fields in lega…

…cy certificate verifier. r=rrelyea Differential Revision: https://phabricator.services.mozilla.com/D148414 --HG-- extra : moz-landing-system : lando
nss-dev · Jun 7, 2022 · 3fe6a46 · roytam1 · Jun 17, 2022 · jschanck
1 parent 71407db
commit 3fe6a46
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/lib/certhigh/certvfy.c b/lib/certhigh/certvfy.c
@@ -737,6 +737,16 @@ cert_VerifyCertChainOld(CERTCertDBHandle *handle, CERTCertificate *cert,
             LOG_ERROR_OR_EXIT(log, subjectCert, count, 0);
         }
 
+        /* check that the signatureAlgorithm field of the certificate
+         * matches the signature field of the tbsCertificate */
+        if (SECOID_CompareAlgorithmID(
+                &subjectCert->signatureWrap.signatureAlgorithm,
+                &subjectCert->signature)) {
+            PORT_SetError(SEC_ERROR_ALGORITHM_MISMATCH);
+            LOG_ERROR(log, subjectCert, count, 0);
+            goto loser;
+        }
+
         /* find the certificate of the issuer */
         issuerCert = CERT_FindCertIssuer(subjectCert, t, certUsage);
         if (!issuerCert) {

diff --git a/lib/util/SECerrs.h b/lib/util/SECerrs.h
@@ -558,3 +558,6 @@ ER3(SEC_ERROR_POLICY_LOCKED, (SEC_ERROR_BASE + 180),
 
 ER3(SEC_ERROR_SIGNATURE_ALGORITHM_DISABLED, (SEC_ERROR_BASE + 181),
     "Could not create or verify a signature using a signature algorithm that is disabled because it is not secure.")
+
+ER3(SEC_ERROR_SIGNATURE_ALGORITHM_DISABLED, (SEC_ERROR_BASE + 181),
+    "The signature algorithm in the signature field of the certificate does not match the algorithm in its signatureAlgorithm field.")
diff --git a/lib/util/secerr.h b/lib/util/secerr.h
@@ -214,6 +214,7 @@ typedef enum {
 
     SEC_ERROR_POLICY_LOCKED = (SEC_ERROR_BASE + 180),
     SEC_ERROR_SIGNATURE_ALGORITHM_DISABLED = (SEC_ERROR_BASE + 181),
+    SEC_ERROR_ALGORITHM_MISMATCH = (SEC_ERROR_BASE + 182),
 
     /* Add new error codes above here. */
     SEC_ERROR_END_OF_LIST