From afee92e0cf6050f1414719c447d4c142d95d0e0b Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Tue, 19 Oct 2021 15:18:42 -0600
Subject: [PATCH] bail out when a bad alt name is found in the list of alt
 names

---
 certs/test/cert-ext-nc.cfg  |   1 -
 certs/test/cert-ext-nc.der  | Bin 1146 -> 1070 bytes
 certs/test/gen-ext-certs.sh |   1 -
 tests/api.c                 | 155 +++++++++++++++++++++++++++++++++++-
 wolfcrypt/src/asn.c         |  12 +++
 5 files changed, 164 insertions(+), 5 deletions(-)

diff --git a/certs/test/cert-ext-nc.cfg b/certs/test/cert-ext-nc.cfg
index 9e8ff6be5..ce3757091 100644
--- a/certs/test/cert-ext-nc.cfg
+++ b/certs/test/cert-ext-nc.cfg
@@ -10,7 +10,6 @@ L             = Brisbane
 O             = wolfSSL Inc
 OU            = Engineering
 CN            = www.wolfssl.com
-emailAddress  = support@wolfsssl.com
 
 [ v3_ca ]
 subjectKeyIdentifier = hash
diff --git a/certs/test/cert-ext-nc.der b/certs/test/cert-ext-nc.der
index e16710d1ec0e58c265ac9ffd27c65b162d445383..a390dbfd32f8ba66411aa3c3cea3b70cfbbf7de1 100644
GIT binary patch
delta 351
zcmeyxv5rI2povAxpov*%0W%XL6B8%H{$zjtj%G;}170>xtu~Lg@4SqR+^h@+)f3-V
zD;da%^BNf%8W>s{85o-xnMaB98krcF8=6A7U{#xY8Q(J27cBVk%vos3vjV}C4M|I5
zURuZ0*)Cq(-LZ3v$Ju{6JWE%1>^Xk;qtXl0+_Pqv4D&uP9=U(+Vp;n9N-oAbg~D92
zHl@v{8T;#2n@b;1KF7iHRq0^gIi~Lu7TGP4oA8YNm?Eon&y1VTZ!#V-zaV}rc%ws*
z_s*|3_FXIy{GD@7#^zzY<)_pPZJ(kOdHyq>I>&DKwfXmnO&xK^-Mx?8`q?<4NQFf}
zF#Jz?Y+eF?O;YU6)+Jj$ukkLK>5@F-^K8jh=?2dyn_Xs|C<<GmkTSK<ob7no=Vhl}
zn53RNAf4={GuPNW>a$GRd7i27y&OWec6aYzIX|#{{;GFhwq>PA<uN|2PGOq<0svys
BnePAq

delta 421
zcmZ3-@ry&tpoyi-pouwd0W%XL6B8%H;?E)r!!uk$4S3l&wc0$|zVk9Na<eiRG%lE^
zS?yt{Y@i4i=VTNUDK0H2$S*2!D9_JHD=se1(M!(HHINhMH8M0XGBhx>G_f=_juPiJ
zGBz|cFo$v>X360<YqJ&O7smQxHJL>Pv(9O5``0fTvC!~Yx~AzX>*)`qRIAobi{zYK
zaDG}_+T7=@<*7YSEV2&<+2=@FTzqqC;WCXtm1Ru=o(tbw@SVK4ZsRIJ&dHnBvw9UT
zFZ0M?OMUvzfb-kt%bO={483*RT=YZE9KY2QU-~I|zEEU5-8JF<*H!ho9=-K9+3V*$
zm~qtgrH?)1^g@=xFo#MuM$P?ltCJh%Uw*OiIa@R1j(nS%-6HW$s*jXg1Ly5iD)oIh
zz4*_im669c2-Gewy7}W|iuVmcHc#7NmPC%!6Gv9B@8A#YE0FU(^zBGf(z{8bC3OnA
j{nJi5owDHmm-u<zv&5{!QM@P5cY2@IV{-n&G;t>Y<cF&#

diff --git a/certs/test/gen-ext-certs.sh b/certs/test/gen-ext-certs.sh
index 8a19bc2c2..045942d71 100755
--- a/certs/test/gen-ext-certs.sh
+++ b/certs/test/gen-ext-certs.sh
@@ -34,7 +34,6 @@ L             = Brisbane
 O             = wolfSSL Inc
 OU            = Engineering
 CN            = www.wolfssl.com
-emailAddress  = support@wolfsssl.com
 
 [ v3_ca ]
 subjectKeyIdentifier = hash
diff --git a/tests/api.c b/tests/api.c
index fad880d66..a3d658a47 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -1462,9 +1462,13 @@ static void test_wolfSSL_CertManagerNameConstraint(void)
 #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && \
     !defined(NO_WOLFSSL_CM_VERIFY) && !defined(NO_RSA) && \
     defined(OPENSSL_EXTRA) && defined(WOLFSSL_CERT_GEN) && \
-    defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_ALT_NAMES)
+    defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_ALT_NAMES) && \
+    !defined(NO_SHA256)
     WOLFSSL_CERT_MANAGER* cm;
+    WOLFSSL_EVP_PKEY *priv;
+    WOLFSSL_X509_NAME* name;
     const char* ca_cert = "./certs/test/cert-ext-nc.der";
+    const char* server_cert = "./certs/test/server-goodcn.pem";
     int i = 0;
     static const byte extNameConsOid[] = {85, 29, 30};
 
@@ -1474,7 +1478,7 @@ static void test_wolfSSL_CertManagerNameConstraint(void)
     int     derSz;
     word32  idx = 0;
     byte    *pt;
-    WOLFSSL_X509 *x509;
+    WOLFSSL_X509 *x509, *ca;
 
     wc_InitRng(&rng);
 
@@ -1524,6 +1528,112 @@ static void test_wolfSSL_CertManagerNameConstraint(void)
     wolfSSL_X509_free(x509);
     wc_FreeRsaKey(&key);
     wc_FreeRng(&rng);
+
+    /* add email alt name to satisfy constraint */
+    pt = (byte*)server_key_der_2048;
+    AssertNotNull(priv = wolfSSL_d2i_PrivateKey(EVP_PKEY_RSA, NULL,
+                (const unsigned char**)&pt, sizeof_server_key_der_2048));
+
+    AssertNotNull(cm = wolfSSL_CertManagerNew());
+    AssertNotNull(ca = wolfSSL_X509_load_certificate_file(ca_cert,
+                WOLFSSL_FILETYPE_ASN1));
+
+    AssertNotNull((der = (byte*)wolfSSL_X509_get_der(ca, &derSz)));
+#if 0
+    {
+        //write out x509 for test
+        BIO* out = BIO_new(wolfSSL_BIO_s_file());
+        if (out != NULL) {
+            FILE* f= fopen("ca.der", "wb");
+            BIO_set_fp(out, f, BIO_CLOSE);
+            BIO_write(out, der, derSz);
+            BIO_free(out);
+        }
+    }
+#endif
+    AssertIntEQ(wolfSSL_CertManagerLoadCABuffer(cm, der, derSz,
+                WOLFSSL_FILETYPE_ASN1), WOLFSSL_SUCCESS);
+
+    /* Good cert test with proper alt email name */
+    AssertNotNull(x509 = wolfSSL_X509_load_certificate_file(server_cert,
+                WOLFSSL_FILETYPE_PEM));
+    AssertNotNull(name = wolfSSL_X509_get_subject_name(ca));
+    AssertIntEQ(wolfSSL_X509_set_issuer_name(x509, name), WOLFSSL_SUCCESS);
+
+    AssertNotNull(name = X509_NAME_new());
+    AssertIntEQ(X509_NAME_add_entry_by_txt(name, "countryName", MBSTRING_UTF8,
+                                       (byte*)"US", 2, -1, 0), SSL_SUCCESS);
+    AssertIntEQ(X509_NAME_add_entry_by_txt(name, "commonName", MBSTRING_UTF8,
+                             (byte*)"wolfssl.com", 11, -1, 0), SSL_SUCCESS);
+    AssertIntEQ(X509_NAME_add_entry_by_txt(name, "emailAddress", MBSTRING_UTF8,
+                     (byte*)"support@info.wolfssl.com", 24, -1, 0), SSL_SUCCESS);
+    AssertIntEQ(wolfSSL_X509_set_subject_name(x509, name), WOLFSSL_SUCCESS);
+    X509_NAME_free(name);
+
+    wolfSSL_X509_add_altname(x509, "wolfssl@info.wolfssl.com", ASN_RFC822_TYPE);
+    (void)altEmail;
+
+    AssertIntGT(wolfSSL_X509_sign(x509, priv, EVP_sha256()), 0);
+    #if 0
+    {
+        //write out good x509 for test
+        BIO* out = BIO_new(wolfSSL_BIO_s_file());
+        if (out != NULL) {
+            FILE* f= fopen("good-cert.pem", "wb");
+            BIO_set_fp(out, f, BIO_CLOSE);
+            PEM_write_bio_X509(out, x509);
+            BIO_free(out);
+        }
+    }
+    #endif
+
+    AssertNotNull((der = (byte*)wolfSSL_X509_get_der(x509, &derSz)));
+    AssertIntEQ(wolfSSL_CertManagerVerifyBuffer(cm, der, derSz,
+                WOLFSSL_FILETYPE_ASN1), WOLFSSL_SUCCESS);
+    wolfSSL_X509_free(x509);
+
+
+    /* Cert with bad alt name list */
+    AssertNotNull(x509 = wolfSSL_X509_load_certificate_file(server_cert,
+                WOLFSSL_FILETYPE_PEM));
+    AssertNotNull(name = wolfSSL_X509_get_subject_name(ca));
+    AssertIntEQ(wolfSSL_X509_set_issuer_name(x509, name), WOLFSSL_SUCCESS);
+
+    AssertNotNull(name = X509_NAME_new());
+    AssertIntEQ(X509_NAME_add_entry_by_txt(name, "countryName", MBSTRING_UTF8,
+                                       (byte*)"US", 2, -1, 0), SSL_SUCCESS);
+    AssertIntEQ(X509_NAME_add_entry_by_txt(name, "commonName", MBSTRING_UTF8,
+                             (byte*)"wolfssl.com", 11, -1, 0), SSL_SUCCESS);
+    AssertIntEQ(X509_NAME_add_entry_by_txt(name, "emailAddress", MBSTRING_UTF8,
+                     (byte*)"support@info.wolfssl.com", 24, -1, 0), SSL_SUCCESS);
+    AssertIntEQ(wolfSSL_X509_set_subject_name(x509, name), WOLFSSL_SUCCESS);
+    X509_NAME_free(name);
+
+    wolfSSL_X509_add_altname(x509, "wolfssl@info.com", ASN_RFC822_TYPE);
+    wolfSSL_X509_add_altname(x509, "wolfssl@info.wolfssl.com", ASN_RFC822_TYPE);
+
+    AssertIntGT(wolfSSL_X509_sign(x509, priv, EVP_sha256()), 0);
+#if 0
+    {
+        //write out bad x509 for test
+        BIO* out = BIO_new(wolfSSL_BIO_s_file());
+        if (out != NULL) {
+            FILE* f= fopen("bad-cert.pem", "wb");
+            BIO_set_fp(out, f, BIO_CLOSE);
+            PEM_write_bio_X509(out, x509);
+            BIO_free(out);
+        }
+    }
+#endif
+
+    AssertNotNull((der = (byte*)wolfSSL_X509_get_der(x509, &derSz)));
+    AssertIntEQ(wolfSSL_CertManagerVerifyBuffer(cm, der, derSz,
+                WOLFSSL_FILETYPE_ASN1), ASN_NAME_INVALID_E);
+
+    wolfSSL_CertManagerFree(cm);
+    wolfSSL_X509_free(x509);
+    wolfSSL_X509_free(ca);
+    wolfSSL_EVP_PKEY_free(priv);
 #endif
 }
 
@@ -1615,6 +1725,46 @@ static void test_wolfSSL_CertManagerNameConstraint2(void)
     wolfSSL_X509_add_altname_ex(x509, altNameFail, sizeof(altNameFail),
             ASN_DIR_TYPE);
 
+#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
+    wolfSSL_X509_sign(x509, priv, EVP_sha3_256());
+#else
+    wolfSSL_X509_sign(x509, priv, EVP_sha256());
+#endif
+    AssertNotNull((der = wolfSSL_X509_get_der(x509, &derSz)));
+    AssertIntEQ(wolfSSL_CertManagerVerifyBuffer(cm, der, derSz,
+                WOLFSSL_FILETYPE_ASN1), ASN_NAME_INVALID_E);
+
+
+    /* check that it still fails if one bad altname and one good altname is in
+     * the certificate */
+    wolfSSL_X509_free(x509);
+    AssertNotNull(x509 = wolfSSL_X509_load_certificate_file(server_cert,
+                WOLFSSL_FILETYPE_PEM));
+    AssertNotNull(name = wolfSSL_X509_get_subject_name(ca));
+    AssertIntEQ(wolfSSL_X509_set_issuer_name(x509, name), WOLFSSL_SUCCESS);
+    wolfSSL_X509_add_altname_ex(x509, altName, sizeof(altName), ASN_DIR_TYPE);
+    wolfSSL_X509_add_altname_ex(x509, altNameFail, sizeof(altNameFail),
+            ASN_DIR_TYPE);
+
+#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
+    wolfSSL_X509_sign(x509, priv, EVP_sha3_256());
+#else
+    wolfSSL_X509_sign(x509, priv, EVP_sha256());
+#endif
+    AssertNotNull((der = wolfSSL_X509_get_der(x509, &derSz)));
+    AssertIntEQ(wolfSSL_CertManagerVerifyBuffer(cm, der, derSz,
+                WOLFSSL_FILETYPE_ASN1), ASN_NAME_INVALID_E);
+
+    /* check it fails with switching position of bad altname */
+    wolfSSL_X509_free(x509);
+    AssertNotNull(x509 = wolfSSL_X509_load_certificate_file(server_cert,
+                WOLFSSL_FILETYPE_PEM));
+    AssertNotNull(name = wolfSSL_X509_get_subject_name(ca));
+    AssertIntEQ(wolfSSL_X509_set_issuer_name(x509, name), WOLFSSL_SUCCESS);
+    wolfSSL_X509_add_altname_ex(x509, altNameFail, sizeof(altNameFail),
+            ASN_DIR_TYPE);
+    wolfSSL_X509_add_altname_ex(x509, altName, sizeof(altName), ASN_DIR_TYPE);
+
 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
     wolfSSL_X509_sign(x509, priv, EVP_sha3_256());
 #else
@@ -1654,7 +1804,6 @@ static void test_wolfSSL_CertManagerNameConstraint2(void)
     wolfSSL_CertManagerFree(cm);
     wolfSSL_X509_free(x509);
     wolfSSL_X509_free(ca);
-
     wolfSSL_EVP_PKEY_free(priv);
 #endif
 }
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 07d55c192..32a0817b5 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -13505,6 +13505,12 @@ static int ConfirmNameConstraints(Signer* signer, DecodedCert* cert)
                         matchDns = MatchBaseName(ASN_DNS_TYPE,
                                           name->name, name->len,
                                           base->name, base->nameSz);
+
+                    #ifndef WOLFSSL_NO_ASN_STRICT
+                        /* found a bad name */
+                        if (matchDns == 0)
+                            break;
+                    #endif
                         name = name->next;
                     }
                     break;
@@ -13520,6 +13526,12 @@ static int ConfirmNameConstraints(Signer* signer, DecodedCert* cert)
                         matchEmail = MatchBaseName(ASN_DNS_TYPE,
                                           name->name, name->len,
                                           base->name, base->nameSz);
+
+                    #ifndef WOLFSSL_NO_ASN_STRICT
+                        /* found a bad name */
+                        if (matchEmail == 0)
+                            break;
+                    #endif
                         name = name->next;
                     }
                     break;