wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 04:34:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use NO_SESSION_CACHE as well in preproc checks

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2020-06-30 21:21:43 +02:00
parent b57cf802eb
commit e63a80f1af
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/client/client.c
View File

@@ -2410,7 +2410,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
wolfSSL_CTX_SetCACb(ctx, CaCb); wolfSSL_CTX_SetCACb(ctx, CaCb);
#endif #endif
#ifdef HAVE_EXT_CACHE #if defined(HAVE_EXT_CACHE) && !defined(NO_SESSION_CACHE)
wolfSSL_CTX_sess_set_get_cb(ctx, mySessGetCb); wolfSSL_CTX_sess_set_get_cb(ctx, mySessGetCb);
wolfSSL_CTX_sess_set_new_cb(ctx, mySessNewCb); wolfSSL_CTX_sess_set_new_cb(ctx, mySessNewCb);
wolfSSL_CTX_sess_set_remove_cb(ctx, mySessRemCb); wolfSSL_CTX_sess_set_remove_cb(ctx, mySessRemCb);

8
src/ssl.c
View File

@@ -26974,7 +26974,8 @@ int wolfSSL_sk_SSL_COMP_num(WOLF_STACK_OF(WOLFSSL_COMP)* sk)
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */
#if defined(OPENSSL_EXTRA) || defined(HAVE_EXT_CACHE) #if !defined(NO_SESSION_CACHE) && (defined(OPENSSL_EXTRA) || \
defined(HAVE_EXT_CACHE))
/* stunnel 4.28 needs /* stunnel 4.28 needs
* *
* Callback that is called if a session tries to resume but could not find * Callback that is called if a session tries to resume but could not find
@@ -27391,9 +27392,6 @@ end:
return s; return s;
} }
#endif /* OPENSSL_EXTRA || HAVE_EXT_CACHE */
#if defined(OPENSSL_EXTRA) || defined(HAVE_EXT_CACHE)
long wolfSSL_SESSION_get_timeout(const WOLFSSL_SESSION* sess) long wolfSSL_SESSION_get_timeout(const WOLFSSL_SESSION* sess)
{ {
long timeout = 0; long timeout = 0;
@@ -27426,7 +27424,7 @@ long wolfSSL_SSL_SESSION_set_timeout(WOLFSSL_SESSION* ses, long t)
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* OPENSSL_EXTRA || HAVE_EXT_CACHE */ #endif /* !NO_SESSION_CACHE && OPENSSL_EXTRA || HAVE_EXT_CACHE */
#ifdef KEEP_PEER_CERT #ifdef KEEP_PEER_CERT

2
tests/api.c
View File

@@ -25902,7 +25902,7 @@ static void test_wolfSSL_SESSION(void)
{ {
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && \ #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && \
!defined(NO_RSA) && defined(HAVE_EXT_CACHE) && \ !defined(NO_RSA) && defined(HAVE_EXT_CACHE) && \
defined(HAVE_IO_TESTS_DEPENDENCIES) defined(HAVE_IO_TESTS_DEPENDENCIES) && !defined(NO_SESSION_CACHE)
WOLFSSL* ssl; WOLFSSL* ssl;
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;