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

Fix for Jenkins report Expected Configurations Test - NIGHTLY BUILD #267, building ./configure --disable-asn --disable-ecc --disable-rsa --enable-psk --enable-sni. Reported unused variables, parameters and function.

Browse Source
This commit is contained in:
David Garske
2018-04-26 05:47:48 -07:00
parent 04626c6a1f
commit fe4cbb2a03
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/tls.c
View File

@@ -56,12 +56,21 @@
#endif #endif
#endif /* HAVE_QSH */ #endif /* HAVE_QSH */
#if !defined(NO_WOLFSSL_SERVER) && defined(WOLFSSL_TLS13) && \ #if (!defined(NO_WOLFSSL_SERVER) && defined(WOLFSSL_TLS13) && \
!defined(WOLFSSL_NO_SERVER_GROUPS_EXT) !defined(WOLFSSL_NO_SERVER_GROUPS_EXT)) || \
(defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES))
static int TLSX_KeyShare_IsSupported(int namedGroup); static int TLSX_KeyShare_IsSupported(int namedGroup);
#endif
#if (!defined(NO_WOLFSSL_SERVER) && defined(WOLFSSL_TLS13) && \
!defined(WOLFSSL_NO_SERVER_GROUPS_EXT)) || \
(defined(WOLFSSL_TLS13) && !defined(HAVE_ECC) && \
defined(HAVE_SUPPORTED_CURVES)) || \
(defined(HAVE_ECC) && defined(HAVE_SUPPORTED_CURVES))
static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions); static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions);
#endif #endif
#ifndef NO_TLS #ifndef NO_TLS
/* Digest enable checks */ /* Digest enable checks */
@@ -8130,9 +8139,13 @@ static byte* TLSX_QSHKeyFind_Pub(QSHKey* qsh, word16* pubLen, word16 name)
} }
#endif /* HAVE_QSH */ #endif /* HAVE_QSH */
#if (!defined(NO_WOLFSSL_SERVER) && defined(WOLFSSL_TLS13) && !defined(WOLFSSL_NO_SERVER_GROUPS_EXT)) || \
(defined(WOLFSSL_TLS13) && !defined(HAVE_ECC) && defined(HAVE_SUPPORTED_CURVES)) || \
(defined(HAVE_ECC) && defined(HAVE_SUPPORTED_CURVES))
static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions) static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions)
{ {
int ret; int ret = WOLFSSL_SUCCESS;
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
int i; int i;
@@ -8151,7 +8164,7 @@ static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions)
} }
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif #endif /* WOLFSSL_TLS13 */
#if defined(HAVE_ECC) && defined(HAVE_SUPPORTED_CURVES) #if defined(HAVE_ECC) && defined(HAVE_SUPPORTED_CURVES)
#ifndef HAVE_FIPS #ifndef HAVE_FIPS
@@ -8205,6 +8218,7 @@ static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions)
#endif #endif
#endif #endif
#endif /* HAVE_ECC && HAVE_SUPPORTED_CURVES */ #endif /* HAVE_ECC && HAVE_SUPPORTED_CURVES */
#ifndef HAVE_FIPS #ifndef HAVE_FIPS
#if defined(HAVE_CURVE25519) #if defined(HAVE_CURVE25519)
ret = TLSX_UseSupportedCurve(extensions, ret = TLSX_UseSupportedCurve(extensions,
@@ -8212,6 +8226,7 @@ static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions)
if (ret != WOLFSSL_SUCCESS) return ret; if (ret != WOLFSSL_SUCCESS) return ret;
#endif #endif
#endif /* HAVE_FIPS */ #endif /* HAVE_FIPS */
#if defined(HAVE_ECC) && defined(HAVE_SUPPORTED_CURVES) #if defined(HAVE_ECC) && defined(HAVE_SUPPORTED_CURVES)
#if !defined(NO_ECC256) || defined(HAVE_ALL_CURVES) #if !defined(NO_ECC256) || defined(HAVE_ALL_CURVES)
#ifdef HAVE_ECC_KOBLITZ #ifdef HAVE_ECC_KOBLITZ
@@ -8251,7 +8266,7 @@ static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions)
if (ret != WOLFSSL_SUCCESS) return ret; if (ret != WOLFSSL_SUCCESS) return ret;
#endif #endif
#endif #endif
#endif #endif /* HAVE_ECC && HAVE_SUPPORTED_CURVES */
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
if (IsAtLeastTLSv1_3(ssl->version)) { if (IsAtLeastTLSv1_3(ssl->version)) {
@@ -8287,11 +8302,16 @@ static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions)
return ret; return ret;
#endif #endif
} }
#endif #endif /* WOLFSSL_TLS13 */
return WOLFSSL_SUCCESS; (void)ssl;
(void)extensions;
return ret;
} }
#endif
int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer) int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer)
{ {
int ret = 0; int ret = 0;