WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updates to address review comments

pull/7597/head
Colton Willey 2024-05-29 17:54:52 -07:00
parent af537a6ae3
commit a4544ce2eb
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/api.c
View File

@ -41520,11 +41520,11 @@ static int test_wolfSSL_X509_max_altnames(void)
0xff, 0x9f, 0xea, 0x78, 0x6f, 0x11, 0x9d, 0xe6 0xff, 0x9f, 0xea, 0x78, 0x6f, 0x11, 0x9d, 0xe6
}; };
X509* x509 = NULL; WOLFSSL_X509* x509 = NULL;
int certSize = (int)sizeof(too_many_altnames_cert) / sizeof(unsigned char); int certSize = (int)(sizeof(too_many_altnames_cert) / sizeof(unsigned char));
ExpectNull(x509 = wolfSSL_X509_load_certificate_buffer( ExpectNull(x509 = wolfSSL_X509_load_certificate_buffer(
too_many_altnames_cert, certSize, SSL_FILETYPE_ASN1)); too_many_altnames_cert, certSize, WOLFSSL_FILETYPE_ASN1));
#endif #endif
#endif #endif
return EXPECT_RESULT(); return EXPECT_RESULT();
@ -41534,7 +41534,7 @@ static int test_wolfSSL_X509_max_name_constraints(void)
{ {
EXPECT_DECLS; EXPECT_DECLS;
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) && \ #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) && \
!defined(NO_WOLFSSL_CLIENT) !(defined(NO_WOLFSSL_CLIENT) && defined(NO_WOLFSSL_SERVER))
/* Only test if max name constraints has not been modified */ /* Only test if max name constraints has not been modified */
#if WOLFSSL_MAX_NAME_CONSTRAINTS == 128 #if WOLFSSL_MAX_NAME_CONSTRAINTS == 128
@ -41542,7 +41542,11 @@ static int test_wolfSSL_X509_max_name_constraints(void)
/* File contains a certificate with 130 name constraints */ /* File contains a certificate with 130 name constraints */
const char* malformed_ca_cert = "./certs/test/cert-too-many-name-constraints.pem"; const char* malformed_ca_cert = "./certs/test/cert-too-many-name-constraints.pem";
#ifndef NO_WOLFSSL_SERVER
ExpectNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()));
#else
ExpectNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method())); ExpectNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
#endif
ExpectIntNE(wolfSSL_CTX_load_verify_locations_ex(ctx, malformed_ca_cert, NULL, ExpectIntNE(wolfSSL_CTX_load_verify_locations_ex(ctx, malformed_ca_cert, NULL,
WOLFSSL_LOAD_FLAG_NONE), WOLFSSL_SUCCESS); WOLFSSL_LOAD_FLAG_NONE), WOLFSSL_SUCCESS);

6
wolfssl/wolfcrypt/asn.h
View File

@ -780,10 +780,16 @@ extern const WOLFSSL_ObjectInfo wolfssl_object_info[];
#define WOLFSSL_TLS_FEATURE_SUM 92 #define WOLFSSL_TLS_FEATURE_SUM 92
#endif #endif
/* Maximum number of allowed subject alternative names in a certificate.
* Any certificate containing more than this number of subject
* alternative names will cause an error when attempting to parse. */
#ifndef WOLFSSL_MAX_ALT_NAMES #ifndef WOLFSSL_MAX_ALT_NAMES
#define WOLFSSL_MAX_ALT_NAMES 128 #define WOLFSSL_MAX_ALT_NAMES 128
#endif #endif
/* Maximum number of allowed name constraints in a certificate.
* Any certificate containing more than this number of name constraints
* will cause an error when attempting to parse. */
#ifndef WOLFSSL_MAX_NAME_CONSTRAINTS #ifndef WOLFSSL_MAX_NAME_CONSTRAINTS
#define WOLFSSL_MAX_NAME_CONSTRAINTS 128 #define WOLFSSL_MAX_NAME_CONSTRAINTS 128
#endif #endif