feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #7014 from SparkiDev/ssl_free_tlsx_fixup

Browse Source 
SSL_free, TLSX_Remove calls: fix #if protection
This commit is contained in:
JacobBarthelmeh
2023-11-30 16:56:46 -07:00
committed by GitHub
parent 8097ed74c3 7ebad05446
commit a1e74d9974
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/internal.c
View File

@ -8458,9 +8458,9 @@ void FreeHandshakeResources(WOLFSSL* ssl)
} }
#endif /* HAVE_PK_CALLBACKS */ #endif /* HAVE_PK_CALLBACKS */
#if defined(HAVE_TLS_EXTENSIONS) && !defined(HAVE_SNI) && !defined(NO_TLS) && \ #if defined(HAVE_TLS_EXTENSIONS) && !defined(NO_TLS)
!defined(HAVE_ALPN) && !defined(WOLFSSL_POST_HANDSHAKE_AUTH) && \ #if !defined(HAVE_SNI) && !defined(HAVE_ALPN) && !defined(WOLFSSL_DTLS_CID) && \
!defined(WOLFSSL_DTLS_CID) !defined(WOLFSSL_POST_HANDSHAKE_AUTH)
/* Some extensions need to be kept for post-handshake querying. */ /* Some extensions need to be kept for post-handshake querying. */
TLSX_FreeAll(ssl->extensions, ssl->heap); TLSX_FreeAll(ssl->extensions, ssl->heap);
ssl->extensions = NULL; ssl->extensions = NULL;
@ -8474,7 +8474,9 @@ void FreeHandshakeResources(WOLFSSL* ssl)
TLSX_Remove(&ssl->extensions, TLSX_SUPPORTED_VERSIONS, ssl->heap); TLSX_Remove(&ssl->extensions, TLSX_SUPPORTED_VERSIONS, ssl->heap);
TLSX_Remove(&ssl->extensions, TLSX_KEY_SHARE, ssl->heap); TLSX_Remove(&ssl->extensions, TLSX_KEY_SHARE, ssl->heap);
#endif #endif
#endif #endif /* !HAVE_SNI && && !HAVE_ALPN && !WOLFSSL_DTLS_CID &&
* !WOLFSSL_POST_HANDSHAKE_AUTH */
#endif /* HAVE_TLS_EXTENSIONS && !NO_TLS */
#ifdef WOLFSSL_STATIC_MEMORY #ifdef WOLFSSL_STATIC_MEMORY
/* when done with handshake decrement current handshake count */ /* when done with handshake decrement current handshake count */