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

Fixes for minor nightly build tests.

Browse Source
This commit is contained in:
David Garske
2019-09-25 07:17:57 -07:00
parent bcd8a521f5
commit 9d05e9c0b7
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/server/server.c
View File

@@ -1189,7 +1189,9 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
#endif #endif
} }
else if (XSTRNCMP(myoptarg, "overrideDateErr", 15) == 0) { else if (XSTRNCMP(myoptarg, "overrideDateErr", 15) == 0) {
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS)
overrideDateErrors = 1; overrideDateErrors = 1;
#endif
} }
else { else {
Usage(); Usage();

12
src/ssl.c
View File

@@ -10396,7 +10396,7 @@ static int wolfSSL_parse_cipher_list(WOLFSSL_CTX* ctx, Suites* suites,
name[(length == sizeof(name)) ? length - 1 : length] = 0; name[(length == sizeof(name)) ? length - 1 : length] = 0;
/* check for "not" case */ /* check for "not" case */
if (name[0] == '!') { if (name[0] == '!' && suiteSz > 0) {
/* populate list with all suites if not already created */ /* populate list with all suites if not already created */
if (localList == NULL) { if (localList == NULL) {
for (i = 0; i < suiteSz; i++) { for (i = 0; i < suiteSz; i++) {
@@ -40287,8 +40287,11 @@ const byte* wolfSSL_SESSION_get_id(WOLFSSL_SESSION* sess, unsigned int* idLen)
return sess->sessionID; return sess->sessionID;
} }
#if defined(SESSION_CERTS) || (defined(WOLFSSL_TLS13) && \ #if (defined(HAVE_SESSION_TICKET) || defined(SESSION_CERTS)) && \
defined(HAVE_SESSION_TICKET)) !defined(NO_FILESYSTEM)
#if defined(SESSION_CERTS) || \
(defined(WOLFSSL_TLS13) && defined(HAVE_SESSION_TICKET))
/* returns a pointer to the protocol used by the session */ /* returns a pointer to the protocol used by the session */
static const char* wolfSSL_SESSION_get_protocol(const WOLFSSL_SESSION* in) static const char* wolfSSL_SESSION_get_protocol(const WOLFSSL_SESSION* in)
{ {
@@ -40296,9 +40299,6 @@ static const char* wolfSSL_SESSION_get_protocol(const WOLFSSL_SESSION* in)
} }
#endif #endif
#if (defined(HAVE_SESSION_TICKET) || defined(SESSION_CERTS)) && \
!defined(NO_FILESYSTEM)
/* returns true (non 0) if the session has EMS (extended master secret) */ /* returns true (non 0) if the session has EMS (extended master secret) */
static int wolfSSL_SESSION_haveEMS(const WOLFSSL_SESSION* in) static int wolfSSL_SESSION_haveEMS(const WOLFSSL_SESSION* in)
{ {