mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patches

Browse Source 
1. Define Timeval in callbacks.h if the file sys/time.h is missing.
2. When picking the correct strtok() function, take into account MINGW64.
3. In the example server, changed the call to SSL_accept_ex() as it doesn't exist. Using wolfSSL_accept_ex(). Only a problem when setting WOLFSSL_CALLBACKS.
4. PickHashSigAlgo() is missing a ; when WOLFSSL_CALLBACKS is set.
This commit is contained in:
John Safranek 2018-08-24 11:21:10 -07:00
parent 7f324d2c3b
commit 4eb0d32fa8
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/server/server.c
View File

@ -120,7 +120,7 @@ static int NonBlockingSSL_Accept(SSL* ssl)
#ifndef WOLFSSL_CALLBACKS
int ret = SSL_accept(ssl);
#else
int ret = SSL_accept_ex(ssl, srvHandShakeCB, srvTimeoutCB, srvTo);
int ret = wolfSSL_accept_ex(ssl, srvHandShakeCB, srvTimeoutCB, srvTo);
#endif
int error = SSL_get_error(ssl, 0);
SOCKET_T sockfd = (SOCKET_T)SSL_get_fd(ssl);
@ -163,7 +163,7 @@ static int NonBlockingSSL_Accept(SSL* ssl)
#ifndef WOLFSSL_CALLBACKS
ret = SSL_accept(ssl);
#else
ret = SSL_accept_ex(ssl,
ret = wolfSSL_accept_ex(ssl,
srvHandShakeCB, srvTimeoutCB, srvTo);
#endif
error = SSL_get_error(ssl, 0);

2
src/internal.c
View File

@ -16346,7 +16346,7 @@ void PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo,
char* packetName = info->packetNames[info->numberPackets];
XSTRNCPY(packetName, name, MAX_PACKETNAME_SZ);
packetName[MAX_PACKETNAME_SZ] = '\0';
info->numberPackets++
info->numberPackets++;
}
#endif
(void)ssl;

10
wolfssl/callbacks.h
View File

@ -52,7 +52,15 @@ typedef struct handShakeInfo_st {
} HandShakeInfo;
typedef struct timeval Timeval;
#ifdef HAVE_SYS_TIME_H
typedef struct timeval Timeval;
#else /* HAVE_SYS_TIME_H */
/* Define the Timeval explicitly. */
typedef struct {
long tv_sec; /* Seconds. */
long tv_usec; /* Microseconds. */
} Timeval;
#endif /* HAVE_SYS_TIME_H */
typedef struct packetInfo_st {

3
wolfssl/wolfcrypt/types.h
View File

@ -315,7 +315,8 @@
#endif
#if !defined(USE_WOLF_STRTOK) && \
(defined(__MINGW32__) || defined(WOLFSSL_TIRTOS) || defined(WOLF_C99))
((defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) || \
defined(WOLFSSL_TIRTOS) || defined(WOLF_C99))
#define USE_WOLF_STRTOK
#endif
#if !defined(USE_WOLF_STRSEP) && (defined(WOLF_C99))