Merge pull request #7794 from anhu/custom_ext_stop

Stop testing custom extensions in dual alg cert tests.
This commit is contained in:
Daniel Pouzzner
2024-07-25 16:33:56 -05:00
committed by GitHub

View File

@ -1179,8 +1179,6 @@ static int do_dual_alg_server_certgen(byte **out, char *caKeyFile,
newCert.sigType = CTC_SHA256wRSA; newCert.sigType = CTC_SHA256wRSA;
newCert.isCA = 0; newCert.isCA = 0;
ExpectIntEQ(wc_SetIssuerBuffer(&newCert, caCertBuf, caCertSz), 0); ExpectIntEQ(wc_SetIssuerBuffer(&newCert, caCertBuf, caCertSz), 0);
ExpectIntEQ(wc_SetCustomExtension(&newCert, 0, "1.2.3.4.5",
(const byte *)"This is NOT a critical extension", 32), 0);
ExpectIntEQ(wc_SetCustomExtension(&newCert, 0, "2.5.29.72", sapkiBuf, ExpectIntEQ(wc_SetCustomExtension(&newCert, 0, "2.5.29.72", sapkiBuf,
sapkiSz), 0); sapkiSz), 0);
ExpectIntEQ(wc_SetCustomExtension(&newCert, 0, "2.5.29.73", altSigAlgBuf, ExpectIntEQ(wc_SetCustomExtension(&newCert, 0, "2.5.29.73", altSigAlgBuf,
@ -1246,21 +1244,6 @@ static int do_dual_alg_tls13_connection(byte *caCert, word32 caCertSz,
return EXPECT_RESULT(); return EXPECT_RESULT();
} }
static int extCount = 0;
static int myUnknownExtCallback(const word16* oid, word32 oidSz, int crit,
const unsigned char* der, word32 derSz)
{
(void) oid;
(void) oidSz;
(void) crit;
(void) der;
(void) derSz;
extCount ++;
/* Accept all extensions. This is only a test. Normally we would be much more
* careful about critical extensions. */
return 0;
}
static int test_dual_alg_support(void) static int test_dual_alg_support(void)
{ {
EXPECT_DECLS; EXPECT_DECLS;
@ -1276,7 +1259,6 @@ static int test_dual_alg_support(void)
int rootSz = 0; int rootSz = 0;
byte *server = NULL; byte *server = NULL;
int serverSz = 0; int serverSz = 0;
WOLFSSL_CERT_MANAGER* cm = NULL;
ExpectIntEQ(load_file(keyFile, &serverKey, &serverKeySz), 0); ExpectIntEQ(load_file(keyFile, &serverKey, &serverKeySz), 0);
@ -1329,19 +1311,6 @@ static int test_dual_alg_support(void)
TEST_SUCCESS); TEST_SUCCESS);
#endif #endif
/* Lets see if CertManager can find the new extensions */
extCount = 0;
ExpectNotNull(cm = wolfSSL_CertManagerNew());
wolfSSL_CertManagerSetUnknownExtCallback(cm, myUnknownExtCallback);
ExpectIntEQ(wolfSSL_CertManagerLoadCABuffer(cm, root, rootSz,
SSL_FILETYPE_ASN1), WOLFSSL_SUCCESS);
ExpectIntEQ(wolfSSL_CertManagerVerifyBuffer(cm, server, serverSz,
SSL_FILETYPE_ASN1), WOLFSSL_SUCCESS);
/* There is only 1 unknown extension (1.2.3.4.5). The other ones are known
* because they are for the dual alg extensions. */
ExpectIntEQ(extCount, 1);
wolfSSL_CertManagerFree(cm);
XFREE(root, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(root, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(server, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(server, NULL, DYNAMIC_TYPE_TMP_BUFFER);