wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6104 from douzzer/20230216-readability-redundant-preprocessor

Browse Source 
20230216-readability-redundant-preprocessor
This commit is contained in:
David Garske
2023-02-17 10:31:27 -08:00
committed by GitHub
parent 24fd561bf8 21645460cd
commit 4edb7e26b9
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tls13.c
View File

@ -5562,7 +5562,7 @@ static int FindPsk(WOLFSSL* ssl, PreSharedKey* psk, const byte* suite, int* err)
*err = ret; *err = ret;
return found; return found;
} }
#endif #endif /* !NO_PSK */
/* Handle any Pre-Shared Key (PSK) extension. /* Handle any Pre-Shared Key (PSK) extension.
* Find a PSK that supports the cipher suite passed in. * Find a PSK that supports the cipher suite passed in.
@ -5710,7 +5710,7 @@ static int DoPreSharedKeys(WOLFSSL* ssl, const byte* input, word32 inputSz,
return ret; return ret;
} }
else else
#endif #endif /* HAVE_SESSION_TICKET */
#ifndef NO_PSK #ifndef NO_PSK
if (FindPsk(ssl, current, suite, &ret)) { if (FindPsk(ssl, current, suite, &ret)) {
if (ret != 0) if (ret != 0)
@ -5918,7 +5918,6 @@ static int CheckPreSharedKeys(WOLFSSL* ssl, const byte* input, word32 helloSz,
} }
modes = ext->val; modes = ext->val;
#if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK)
#ifdef HAVE_SUPPORTED_CURVES #ifdef HAVE_SUPPORTED_CURVES
ext = TLSX_Find(ssl->extensions, TLSX_KEY_SHARE); ext = TLSX_Find(ssl->extensions, TLSX_KEY_SHARE);
/* Use (EC)DHE for forward-security if possible. */ /* Use (EC)DHE for forward-security if possible. */
@ -5945,7 +5944,6 @@ static int CheckPreSharedKeys(WOLFSSL* ssl, const byte* input, word32 helloSz,
*usingPSK = 1; *usingPSK = 1;
} }
#endif
} }
#ifdef WOLFSSL_PSK_ID_PROTECTION #ifdef WOLFSSL_PSK_ID_PROTECTION
else { else {