wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor session cache on checking into function

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2021-08-03 15:56:32 +02:00
parent 46b061c7bc
commit 2cd499d2df
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/ssl.c
View File

@ -14072,6 +14072,22 @@ static WC_INLINE void RestoreSession(WOLFSSL* ssl, WOLFSSL_SESSION* session,
#endif #endif
} }
static int SslSessionCacheOn(const WOLFSSL* ssl, const WOLFSSL_SESSION* session)
{
(void)session;
if (ssl->options.sessionCacheOff
#if defined(HAVE_SESSION_TICKET) && defined(WOLFSSL_FORCE_CACHE_ON_TICKET)
&& session->ticketLen == 0
#endif
#ifdef OPENSSL_EXTRA
&& ssl->options.side != WOLFSSL_CLIENT_END
#endif
)
return WOLFSSL_FAILURE;
else
return WOLFSSL_SUCCESS;
}
WOLFSSL_SESSION* GetSession(WOLFSSL* ssl, byte* masterSecret, WOLFSSL_SESSION* GetSession(WOLFSSL* ssl, byte* masterSecret,
byte restoreSessionCerts) byte restoreSessionCerts)
{ {
@ -14084,14 +14100,7 @@ WOLFSSL_SESSION* GetSession(WOLFSSL* ssl, byte* masterSecret,
(void) restoreSessionCerts; (void) restoreSessionCerts;
if (ssl->options.sessionCacheOff if (!SslSessionCacheOn(ssl, &ssl->session))
#if defined(HAVE_SESSION_TICKET) && defined(WOLFSSL_FORCE_CACHE_ON_TICKET)
&& ssl->session.ticketLen == 0
#endif
#ifdef OPENSSL_EXTRA
&& ssl->options.side != WOLFSSL_CLIENT_END
#endif
)
return NULL; return NULL;
if (ssl->options.haveSessionId == 0) if (ssl->options.haveSessionId == 0)
@ -14295,17 +14304,9 @@ static int GetDeepCopySession(WOLFSSL* ssl, WOLFSSL_SESSION* copyFrom)
return ret; return ret;
} }
int SetSession(WOLFSSL* ssl, WOLFSSL_SESSION* session) int SetSession(WOLFSSL* ssl, WOLFSSL_SESSION* session)
{ {
if (ssl == NULL || (ssl->options.sessionCacheOff if (ssl == NULL || !SslSessionCacheOn(ssl, session))
#if defined(HAVE_SESSION_TICKET) && defined(WOLFSSL_FORCE_CACHE_ON_TICKET)
&& session->ticketLen == 0
#endif
#ifdef OPENSSL_EXTRA
&& ssl->options.side != WOLFSSL_CLIENT_END
#endif
))
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
@ -14370,14 +14371,7 @@ int AddSession(WOLFSSL* ssl)
int cbRet = 0; int cbRet = 0;
#endif #endif
if (ssl->options.sessionCacheOff if (!SslSessionCacheOn(ssl, &ssl->session))
#if defined(HAVE_SESSION_TICKET) && defined(WOLFSSL_FORCE_CACHE_ON_TICKET)
&& ssl->session.ticketLen == 0
#endif
#ifdef OPENSSL_EXTRA
&& ssl->options.side != WOLFSSL_CLIENT_END
#endif
)
return 0; return 0;
if (ssl->options.haveSessionId == 0) if (ssl->options.haveSessionId == 0)