From a540c6ade5e524e6f1e22db25bf00fba167ce0ed Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Tue, 5 Nov 2024 00:00:19 -0600 Subject: [PATCH] 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 610cab4c8..7405b70db 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 91ef127b4..c08d0987d 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); }