WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1522 from dgarske/mbedtls_compat 

Port for using AWS FreeRTOS
pull/1562/merge
toddouska 2018-05-16 07:57:55 -07:00 committed by GitHub
parent 1be8a6e4ef af9507391a
commit 8619062ae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl.c
View File

@ -21079,6 +21079,7 @@ int wolfSSL_RAND_write_file(const char* fname)
return bytes; return bytes;
} }
#ifndef FREERTOS_TCP
/* These constant values are protocol values made by egd */ /* These constant values are protocol values made by egd */
#if defined(USE_WOLFSSL_IO) && !defined(USE_WINDOWS_API) #if defined(USE_WOLFSSL_IO) && !defined(USE_WINDOWS_API)
@ -21243,6 +21244,7 @@ int wolfSSL_RAND_egd(const char* nm)
#endif /* defined(USE_WOLFSSL_IO) && !defined(USE_WINDOWS_API) */ #endif /* defined(USE_WOLFSSL_IO) && !defined(USE_WINDOWS_API) */
} }
#endif /* !FREERTOS_TCP */
void wolfSSL_RAND_Cleanup(void) void wolfSSL_RAND_Cleanup(void)
{ {

2
src/tls.c
View File

@ -6280,6 +6280,8 @@ static int TLSX_KeyShare_New(KeyShareEntry** list, int group, void *heap,
*list = kse; *list = kse;
*keyShareEntry = kse; *keyShareEntry = kse;
(void)heap;
return 0; return 0;
} }

10
src/tls13.c 100644 → 100755
View File

@ -302,7 +302,7 @@ static int DeriveKeyMsg(WOLFSSL* ssl, byte* output, int outputLen,
word32 hashSz = 0; word32 hashSz = 0;
const byte* protocol; const byte* protocol;
word32 protocolLen; word32 protocolLen;
int digestAlg; int digestAlg = -1;
int ret = BAD_FUNC_ARG; int ret = BAD_FUNC_ARG;
switch (hashAlgo) { switch (hashAlgo) {
@ -345,8 +345,14 @@ static int DeriveKeyMsg(WOLFSSL* ssl, byte* output, int outputLen,
digestAlg = WC_SHA512; digestAlg = WC_SHA512;
break; break;
#endif #endif
default:
digestAlg = -1;
break;
} }
if (digestAlg < 0)
return HASH_TYPE_E;
if (ret != 0) if (ret != 0)
return ret; return ret;
@ -3729,7 +3735,7 @@ static int RestartHandshakeHashWithCookie(WOLFSSL* ssl, Cookie* cookie)
int DoTls13ClientHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx, int DoTls13ClientHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
word32 helloSz) word32 helloSz)
{ {
int ret; int ret = VERSION_ERROR;
byte b; byte b;
ProtocolVersion pv; ProtocolVersion pv;
Suites clSuites; Suites clSuites;

4
wolfssl/wolfcrypt/types.h
View File

@ -171,7 +171,7 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define THREAD_LS_T __declspec(thread) #define THREAD_LS_T __declspec(thread)
/* Thread local storage only in FreeRTOS v8.2.1 and higher */ /* Thread local storage only in FreeRTOS v8.2.1 and higher */
#elif defined(FREERTOS) #elif defined(FREERTOS) || defined(FREERTOS_TCP)
#define THREAD_LS_T #define THREAD_LS_T
#else #else
#define THREAD_LS_T __thread #define THREAD_LS_T __thread
@ -329,7 +329,7 @@
#if defined(MICROCHIP_PIC32) || defined(WOLFSSL_TIRTOS) #if defined(MICROCHIP_PIC32) || defined(WOLFSSL_TIRTOS)
/* XC32 does not support strncasecmp, so use case sensitive one */ /* XC32 does not support strncasecmp, so use case sensitive one */
#define XSTRNCASECMP(s1,s2,n) strncmp((s1),(s2),(n)) #define XSTRNCASECMP(s1,s2,n) strncmp((s1),(s2),(n))
#elif defined(USE_WINDOWS_API) #elif defined(USE_WINDOWS_API) || defined(FREERTOS_TCP_WINSIM)
#define XSTRNCASECMP(s1,s2,n) _strnicmp((s1),(s2),(n)) #define XSTRNCASECMP(s1,s2,n) _strnicmp((s1),(s2),(n))
#else #else
#if (defined(HAVE_STRINGS_H) || defined(WOLF_C99)) && \ #if (defined(HAVE_STRINGS_H) || defined(WOLF_C99)) && \

3
wolfssl/wolfio.h
View File

@ -219,6 +219,9 @@
#else #else
#define CloseSocket(s) close(s) #define CloseSocket(s) close(s)
#define StartTCP() #define StartTCP()
#ifdef FREERTOS_TCP_WINSIM
extern int close(int);
#endif
#endif #endif