wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add test_wolfSSL_dup_CA_list

Browse Source
This commit is contained in:
Tesfa Mael
2023-06-16 12:12:06 -07:00
parent 481ae20fcb
commit 03e5d109c7
4 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/internal.c
View File

@ -6238,8 +6238,18 @@ int SetSSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup)
/* Don't change version on a SSL object that has already started a /* Don't change version on a SSL object that has already started a
* handshake */ * handshake */
#if defined(WOLFSSL_HAPROXY) #if defined(WOLFSSL_HAPROXY)
ssl->initial_ctx = ctx; /* Save access to session key materials */ ret = wolfSSL_CTX_up_ref(ctx);
wolfSSL_CTX_up_ref(ctx); if (ret == WOLFSSL_SUCCESS) {
ssl->initial_ctx = ctx; /* Save access to session key materials */
}
else {
#ifdef WOLFSSL_REFCNT_ERROR_RETURN
return ret;
#else
(void)ret;
#endif
}
#endif #endif
if (!ssl->msgsReceived.got_client_hello && if (!ssl->msgsReceived.got_client_hello &&
!ssl->msgsReceived.got_server_hello) !ssl->msgsReceived.got_server_hello)

3
src/ssl.c
View File

@ -4511,8 +4511,9 @@ int wolfSSL_get_error(WOLFSSL* ssl, int ret)
return WOLFSSL_ERROR_ZERO_RETURN; /* convert to OpenSSL type */ return WOLFSSL_ERROR_ZERO_RETURN; /* convert to OpenSSL type */
#if defined(WOLFSSL_HAPROXY) #if defined(WOLFSSL_HAPROXY)
return GetX509Error(ssl->error); return GetX509Error(ssl->error);
#endif #else
return (ssl->error); return (ssl->error);
#endif
} }

6
src/x509_str.c
View File

@ -979,10 +979,12 @@ int wolfSSL_X509_STORE_set_flags(WOLFSSL_X509_STORE* store, unsigned long flag)
if (store == NULL) if (store == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
if ((flag & WOLFSSL_CRL_CHECKALL) || (flag & WOLFSSL_CRL_CHECK) || if ((flag & WOLFSSL_CRL_CHECKALL) || (flag & WOLFSSL_CRL_CHECK)) {
flag == 0 ) {
ret = wolfSSL_CertManagerEnableCRL(store->cm, (int)flag); ret = wolfSSL_CertManagerEnableCRL(store->cm, (int)flag);
} }
else if (flag == 0) {
ret = wolfSSL_CertManagerDisableCRL(store->cm);
}
return ret; return ret;
} }

38
tests/api.c
View File

@ -50277,7 +50277,43 @@ static int test_wolfSSL_X509_STORE_get1_certs(void)
#endif /* OPENSSL_EXTRA && WOLFSSL_SIGNER_DER_CERT && !NO_FILESYSTEM */ #endif /* OPENSSL_EXTRA && WOLFSSL_SIGNER_DER_CERT && !NO_FILESYSTEM */
return EXPECT_RESULT(); return EXPECT_RESULT();
} }
static int test_wolfSSL_dup_CA_list(void)
{
int res = TEST_SKIPPED;
#if defined(OPENSSL_ALL)
EXPECT_DECLS;
STACK_OF(X509_NAME) *originalStack = NULL;
STACK_OF(X509_NAME) *copyStack = NULL;
int originalCount = 0;
int copyCount = 0;
X509_NAME *name = NULL;
int i;
originalStack = sk_X509_NAME_new_null();
ExpectNotNull(originalStack);
for (i = 0; i < 3; i++) {
name = X509_NAME_new();
ExpectNotNull(name);
AssertIntEQ(sk_X509_NAME_push(originalStack, name), WOLFSSL_SUCCESS);
}
copyStack = SSL_dup_CA_list(originalStack);
ExpectNotNull(copyStack);
originalCount = sk_X509_NAME_num(originalStack);
copyCount = sk_X509_NAME_num(copyStack);
AssertIntEQ(originalCount, copyCount);
sk_X509_NAME_pop_free(originalStack, X509_NAME_free);
sk_X509_NAME_pop_free(copyStack, X509_NAME_free);
originalStack = NULL;
copyStack = NULL;
res = EXPECT_RESULT();
#endif /* OPENSSL_ALL */
return res;
}
/* include misc.c here regardless of NO_INLINE, because misc.c implementations /* include misc.c here regardless of NO_INLINE, because misc.c implementations
* have default (hidden) visibility, and in the absence of visibility, it's * have default (hidden) visibility, and in the absence of visibility, it's
* benign to mask out the library implementation. * benign to mask out the library implementation.
@ -60385,7 +60421,7 @@ TEST_CASE testCases[] = {
TEST_DECL(test_GENERAL_NAME_set0_othername), TEST_DECL(test_GENERAL_NAME_set0_othername),
TEST_DECL(test_othername_and_SID_ext), TEST_DECL(test_othername_and_SID_ext),
TEST_DECL(test_wolfSSL_dup_CA_list),
/* OpenSSL sk_X509 API test */ /* OpenSSL sk_X509 API test */
TEST_DECL(test_sk_X509), TEST_DECL(test_sk_X509),
/* OpenSSL sk_X509_CRL API test */ /* OpenSSL sk_X509_CRL API test */