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

Merge pull request #2218 from abrahamsonn/iar

Browse Source 
IAR-EWARM warning removal/formatting
This commit is contained in:
Chris Conlon
2019-04-30 11:55:29 -07:00
committed by GitHub
parent fdabe614f8 b68253c180
commit 7cdda4d595
5 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl.c
View File

@@ -4659,7 +4659,7 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff,
int resetSuites = 0; int resetSuites = 0;
void* heap = wolfSSL_CTX_GetHeap(ctx, ssl); void* heap = wolfSSL_CTX_GetHeap(ctx, ssl);
int devId = wolfSSL_CTX_GetDevId(ctx, ssl); int devId = wolfSSL_CTX_GetDevId(ctx, ssl);
word32 idx; word32 idx = 0;
int keySz = 0; int keySz = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
EncryptedInfo* info = NULL; EncryptedInfo* info = NULL;

12
src/tls.c
View File

@@ -63,12 +63,13 @@
static int TLSX_KeyShare_IsSupported(int namedGroup); static int TLSX_KeyShare_IsSupported(int namedGroup);
#endif #endif
#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_ECC) && \ (defined(WOLFSSL_TLS13) && !defined(HAVE_ECC) && \
!defined(HAVE_CURVE25519) && defined(HAVE_SUPPORTED_CURVES)) || \ !defined(HAVE_CURVE25519) && defined(HAVE_SUPPORTED_CURVES)) || \
((defined(HAVE_ECC) || defined(HAVE_CURVE25519)) && \ ((defined(HAVE_ECC) || defined(HAVE_CURVE25519)) && \
defined(HAVE_SUPPORTED_CURVES)) defined(HAVE_SUPPORTED_CURVES))) && \
defined(HAVE_TLS_EXTENSIONS)
static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions); static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions);
#endif #endif
@@ -97,6 +98,13 @@ static int TLSX_PopulateSupportedGroups(WOLFSSL* ssl, TLSX** extensions);
#if !defined(NO_RSA) && !defined(WC_RSA_PSS) #if !defined(NO_RSA) && !defined(WC_RSA_PSS)
#error The build option WC_RSA_PSS is required for TLS 1.3 with RSA #error The build option WC_RSA_PSS is required for TLS 1.3 with RSA
#endif #endif
#ifndef HAVE_TLS_EXTENSIONS
#ifndef _MSC_VER
#error "The build option HAVE_TLS_EXTENSIONS is required for TLS 1.3"
#else
#pragma message("Error: The build option HAVE_TLS_EXTENSIONS is required for TLS 1.3")
#endif
#endif
#endif #endif
/* Warn if secrets logging is enabled */ /* Warn if secrets logging is enabled */

11
src/tls13.c
View File

@@ -134,6 +134,14 @@
#error The build option HAVE_HKDF is required for TLS 1.3 #error The build option HAVE_HKDF is required for TLS 1.3
#endif #endif
#ifndef HAVE_TLS_EXTENSIONS
#ifndef _MSC_VER
#error "The build option HAVE_TLS_EXTENSIONS is required for TLS 1.3"
#else
#pragma message("error: The build option HAVE_TLS_EXTENSIONS is required for TLS 1.3")
#endif
#endif
/* Set ret to error value and jump to label. /* Set ret to error value and jump to label.
* *
@@ -4015,7 +4023,8 @@ int DoTls13ClientHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
} }
#endif #endif
#if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK) #if (defined(HAVE_SESSION_TICKET) || !defined(NO_PSK)) && \
defined(HAVE_TLS_EXTENSIONS)
if (TLSX_Find(ssl->extensions, TLSX_PRE_SHARED_KEY) != NULL) { if (TLSX_Find(ssl->extensions, TLSX_PRE_SHARED_KEY) != NULL) {
if (ssl->options.downgrade) { if (ssl->options.downgrade) {
if ((ret = InitHandshakeHashes(ssl)) != 0) if ((ret = InitHandshakeHashes(ssl)) != 0)