From a540c6ade5e524e6f1e22db25bf00fba167ce0ed Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Tue, 5 Nov 2024 00:00:19 -0600 Subject: [PATCH 1/2] configure.ac: activate opensslextra for --enable-curl even if ENABLED_OPENSSLCOEXIST; tests/api.c: in test_wolfSSL_SESSION(), use WOLFSSL_SUCCESS, not SSL_SUCCESS, in HAVE_SESSION_TICKET span reachable in non-OPENSSL_EXTRA builds. --- configure.ac | 2 +- tests/api.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 610cab4c82..7405b70db4 100644 --- a/configure.ac +++ b/configure.ac @@ -7388,7 +7388,7 @@ then ENABLED_WOLFSSH="yes" fi - if test "x$ENABLED_OPENSSLEXTRA" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno" + if test "x$ENABLED_OPENSSLEXTRA" = "xno" then ENABLED_OPENSSLEXTRA="yes" fi diff --git a/tests/api.c b/tests/api.c index 91ef127b4b..c08d0987d1 100644 --- a/tests/api.c +++ b/tests/api.c @@ -71021,10 +71021,10 @@ static int test_wolfSSL_SESSION(void) char buf[64] = {0}; word32 bufSz = (word32)sizeof(buf); - ExpectIntEQ(SSL_SUCCESS, + ExpectIntEQ(WOLFSSL_SUCCESS, wolfSSL_set_SessionTicket(ssl, (byte *)ticket, (word32)XSTRLEN(ticket))); - ExpectIntEQ(SSL_SUCCESS, + ExpectIntEQ(WOLFSSL_SUCCESS, wolfSSL_get_SessionTicket(ssl, (byte *)buf, &bufSz)); ExpectStrEQ(ticket, buf); } From 0f31f5bad945898854dc04dd1c086add75b6a691 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Tue, 5 Nov 2024 00:19:07 -0600 Subject: [PATCH 2/2] codespell fixes. --- .github/workflows/codespell.yml | 2 +- wolfcrypt/src/ASN_TEMPLATE.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index aca3c40edf..5abc0fbc81 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -27,4 +27,4 @@ jobs: # The exclude_file contains lines of code that should be ignored. This is useful for individual lines which have non-words that can safely be ignored. exclude_file: '.codespellexcludelines' # To skip files entirely from being processed, add it to the following list: - skip: '*.cproject,*.der,*.mtpj,*.pem,*.vcxproj,.git,*.launch,*.scfg,./IDE/Renesas/cs+/Projects/t4_demo/README_jp.txt' + skip: '*.cproject,*.der,*.mtpj,*.pem,*.vcxproj,.git,*.launch,*.scfg,*/README_jp.txt' diff --git a/wolfcrypt/src/ASN_TEMPLATE.md b/wolfcrypt/src/ASN_TEMPLATE.md index cce2176df5..5fa3fce320 100644 --- a/wolfcrypt/src/ASN_TEMPLATE.md +++ b/wolfcrypt/src/ASN_TEMPLATE.md @@ -18,7 +18,7 @@ static const ASNItem