feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #2771 from JacobBarthelmeh/Windows

Browse Source 
change public Timeval to WOLFSSL_TIMEVAL
This commit is contained in:
toddouska
2020-02-13 09:38:42 -08:00
committed by GitHub
parent d1397656ef 3c077a3cef
commit b038e2e8f0
8 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/dox_comments/header_files/ssl.h
View File

@ -11278,7 +11278,7 @@ int wolfSSL_DeriveTlsKeys(unsigned char* key_data, word32 keyLen,
\sa wolfSSL_accept_ex \sa wolfSSL_accept_ex
*/ */
WOLFSSL_API int wolfSSL_connect_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack, WOLFSSL_API int wolfSSL_connect_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack,
Timeval); WOLFSSL_TIMEVAL);
/*! /*!
\brief wolfSSL_accept_ex() is an extension that allows a HandShake Callback \brief wolfSSL_accept_ex() is an extension that allows a HandShake Callback
@ -11310,7 +11310,7 @@ WOLFSSL_API int wolfSSL_connect_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack,
\sa wolfSSL_connect_ex \sa wolfSSL_connect_ex
*/ */
WOLFSSL_API int wolfSSL_accept_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack, WOLFSSL_API int wolfSSL_accept_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack,
Timeval); WOLFSSL_TIMEVAL);
/*! /*!
\ingroup IO \ingroup IO

2
examples/client/client.c
View File

@ -72,7 +72,7 @@
static int lng_index = 0; static int lng_index = 0;
#ifdef WOLFSSL_CALLBACKS #ifdef WOLFSSL_CALLBACKS
Timeval timeout; WOLFSSL_TIMEVAL timeout;
static int handShakeCB(HandShakeInfo* info) static int handShakeCB(HandShakeInfo* info)
{ {
(void)info; (void)info;

7
examples/server/server.c
View File

@ -81,7 +81,11 @@ int catastrophic = 0; /* Use with -x flag to still exit when an error is
static int lng_index = 0; static int lng_index = 0;
#ifdef WOLFSSL_CALLBACKS #ifdef WOLFSSL_CALLBACKS
Timeval srvTo; #if !defined(NO_OLD_TIMEVAL_NAME)
Timeval srvTo;
#else
WOLFSSL_TIMEVAL srvTo;
#endif
static int srvHandShakeCB(HandShakeInfo* info) static int srvHandShakeCB(HandShakeInfo* info)
{ {
(void)info; (void)info;
@ -1057,6 +1061,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
(void)mcastID; (void)mcastID;
(void)loadCertKeyIntoSSLObj; (void)loadCertKeyIntoSSLObj;
(void)overrideDateErrors; (void)overrideDateErrors;
(void)nonBlocking;
#ifdef WOLFSSL_TIRTOS #ifdef WOLFSSL_TIRTOS
fdOpenSession(Task_self()); fdOpenSession(Task_self());

2
src/internal.c
View File

@ -18596,7 +18596,7 @@ int PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo, word32 hashSigAlgoSz)
TimeoutInfo* info = &ssl->timeoutInfo; TimeoutInfo* info = &ssl->timeoutInfo;
if (info->numberPackets < (MAX_PACKETS_HANDSHAKE - 1)) { if (info->numberPackets < (MAX_PACKETS_HANDSHAKE - 1)) {
Timeval currTime; WOLFSSL_TIMEVAL currTime;
/* may add name after */ /* may add name after */
if (name) { if (name) {

16
src/ssl.c
View File

@ -11460,10 +11460,10 @@ int wolfSSL_dtls_get_current_timeout(WOLFSSL* ssl)
return timeout; return timeout;
} }
int wolfSSL_DTLSv1_get_timeout(WOLFSSL* ssl, Timeval* timeleft) int wolfSSL_DTLSv1_get_timeout(WOLFSSL* ssl, WOLFSSL_TIMEVAL* timeleft)
{ {
if (ssl && timeleft) { if (ssl && timeleft) {
XMEMSET(timeleft, 0, sizeof(Timeval)); XMEMSET(timeleft, 0, sizeof(WOLFSSL_TIMEVAL));
timeleft->tv_sec = ssl->dtls_timeout; timeleft->tv_sec = ssl->dtls_timeout;
} }
return 0; return 0;
@ -13576,13 +13576,13 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
static int wolfSSL_ex_wrapper(WOLFSSL* ssl, HandShakeCallBack hsCb, static int wolfSSL_ex_wrapper(WOLFSSL* ssl, HandShakeCallBack hsCb,
TimeoutCallBack toCb, Timeval timeout) TimeoutCallBack toCb, WOLFSSL_TIMEVAL timeout)
{ {
int ret = WOLFSSL_FATAL_ERROR; int ret = WOLFSSL_FATAL_ERROR;
int oldTimerOn = 0; /* was timer already on */ int oldTimerOn = 0; /* was timer already on */
Timeval startTime; WOLFSSL_TIMEVAL startTime;
Timeval endTime; WOLFSSL_TIMEVAL endTime;
Timeval totalTime; WOLFSSL_TIMEVAL totalTime;
Itimerval myTimeout; Itimerval myTimeout;
Itimerval oldTimeout; /* if old timer adjust from total time to reset */ Itimerval oldTimeout; /* if old timer adjust from total time to reset */
struct sigaction act, oact; struct sigaction act, oact;
@ -13690,7 +13690,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
#ifndef NO_WOLFSSL_CLIENT #ifndef NO_WOLFSSL_CLIENT
int wolfSSL_connect_ex(WOLFSSL* ssl, HandShakeCallBack hsCb, int wolfSSL_connect_ex(WOLFSSL* ssl, HandShakeCallBack hsCb,
TimeoutCallBack toCb, Timeval timeout) TimeoutCallBack toCb, WOLFSSL_TIMEVAL timeout)
{ {
WOLFSSL_ENTER("wolfSSL_connect_ex"); WOLFSSL_ENTER("wolfSSL_connect_ex");
return wolfSSL_ex_wrapper(ssl, hsCb, toCb, timeout); return wolfSSL_ex_wrapper(ssl, hsCb, toCb, timeout);
@ -13702,7 +13702,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
#ifndef NO_WOLFSSL_SERVER #ifndef NO_WOLFSSL_SERVER
int wolfSSL_accept_ex(WOLFSSL* ssl, HandShakeCallBack hsCb, int wolfSSL_accept_ex(WOLFSSL* ssl, HandShakeCallBack hsCb,
TimeoutCallBack toCb,Timeval timeout) TimeoutCallBack toCb, WOLFSSL_TIMEVAL timeout)
{ {
WOLFSSL_ENTER("wolfSSL_accept_ex"); WOLFSSL_ENTER("wolfSSL_accept_ex");
return wolfSSL_ex_wrapper(ssl, hsCb, toCb, timeout); return wolfSSL_ex_wrapper(ssl, hsCb, toCb, timeout);

14
wolfssl/callbacks.h
View File

@ -53,19 +53,21 @@ typedef struct handShakeInfo_st {
#if defined(HAVE_SYS_TIME_H) && !defined(NO_TIMEVAL) #if defined(HAVE_SYS_TIME_H) && !defined(NO_TIMEVAL)
typedef struct timeval Timeval; typedef struct timeval WOLFSSL_TIMEVAL;
#else /* HAVE_SYS_TIME_H */ #else /* HAVE_SYS_TIME_H */
/* Define the Timeval explicitly. */ /* Define the timeval explicitly. */
typedef struct { typedef struct {
long tv_sec; /* Seconds. */ long tv_sec; /* Seconds. */
long tv_usec; /* Microseconds. */ long tv_usec; /* Microseconds. */
} Timeval; } WOLFSSL_TIMEVAL;
#endif /* HAVE_SYS_TIME_H */ #endif /* HAVE_SYS_TIME_H */
#if !defined(NO_OLD_TIMEVAL_NAME)
#define Timeval WOLFSSL_TIMEVAL
#endif
typedef struct packetInfo_st { typedef struct packetInfo_st {
char packetName[MAX_PACKETNAME_SZ + 1]; /* SSL packet name */ char packetName[MAX_PACKETNAME_SZ + 1]; /* SSL packet name */
Timeval timestamp; /* when it occurred */ WOLFSSL_TIMEVAL timestamp; /* when it occurred */
unsigned char value[MAX_VALUE_SZ]; /* if fits, it's here */ unsigned char value[MAX_VALUE_SZ]; /* if fits, it's here */
unsigned char* bufferValue; /* otherwise here (non 0) */ unsigned char* bufferValue; /* otherwise here (non 0) */
int valueSz; /* sz of value or buffer */ int valueSz; /* sz of value or buffer */
@ -77,7 +79,7 @@ typedef struct timeoutInfo_st {
int flags; /* for future use */ int flags; /* for future use */
int numberPackets; /* actual # of packets */ int numberPackets; /* actual # of packets */
PacketInfo packets[MAX_PACKETS_HANDSHAKE]; /* list of all packets */ PacketInfo packets[MAX_PACKETS_HANDSHAKE]; /* list of all packets */
Timeval timeoutValue; /* timer that caused it */ WOLFSSL_TIMEVAL timeoutValue; /* timer that caused it */
} TimeoutInfo; } TimeoutInfo;

2
wolfssl/openssl/ssl.h
View File

@ -847,7 +847,7 @@ wolfSSL_X509_STORE_set_verify_cb((WOLFSSL_X509_STORE *)(s), (WOLFSSL_X509_STORE_
/* yassl had set the default to be 500 */ /* yassl had set the default to be 500 */
#define SSL_get_default_timeout(ctx) 500 #define SSL_get_default_timeout(ctx) 500
#define DTLSv1_get_timeout(ssl, timeleft) wolfSSL_DTLSv1_get_timeout((ssl), (Timeval*)(timeleft)) #define DTLSv1_get_timeout(ssl, timeleft) wolfSSL_DTLSv1_get_timeout((ssl), (WOLFSSL_TIMEVAL*)(timeleft))
#define DTLSv1_handle_timeout wolfSSL_DTLSv1_handle_timeout #define DTLSv1_handle_timeout wolfSSL_DTLSv1_handle_timeout
#define DTLSv1_set_initial_timeout_duration wolfSSL_DTLSv1_set_initial_timeout_duration #define DTLSv1_set_initial_timeout_duration wolfSSL_DTLSv1_set_initial_timeout_duration

9
wolfssl/ssl.h
View File

@ -987,7 +987,8 @@ WOLFSSL_API int wolfSSL_dtls_get_using_nonblock(WOLFSSL*);
#define wolfSSL_get_using_nonblock wolfSSL_dtls_get_using_nonblock #define wolfSSL_get_using_nonblock wolfSSL_dtls_get_using_nonblock
/* The old names are deprecated. */ /* The old names are deprecated. */
WOLFSSL_API int wolfSSL_dtls_get_current_timeout(WOLFSSL* ssl); WOLFSSL_API int wolfSSL_dtls_get_current_timeout(WOLFSSL* ssl);
WOLFSSL_API int wolfSSL_DTLSv1_get_timeout(WOLFSSL* ssl, Timeval* timeleft); WOLFSSL_API int wolfSSL_DTLSv1_get_timeout(WOLFSSL* ssl,
WOLFSSL_TIMEVAL* timeleft);
WOLFSSL_API void wolfSSL_DTLSv1_set_initial_timeout_duration(WOLFSSL* ssl, WOLFSSL_API void wolfSSL_DTLSv1_set_initial_timeout_duration(WOLFSSL* ssl,
word32 duration_ms); word32 duration_ms);
WOLFSSL_API int wolfSSL_DTLSv1_handle_timeout(WOLFSSL* ssl); WOLFSSL_API int wolfSSL_DTLSv1_handle_timeout(WOLFSSL* ssl);
@ -2046,7 +2047,7 @@ WOLFSSL_API int wolfSSL_set_compression(WOLFSSL* ssl);
WOLFSSL_ABI WOLFSSL_API int wolfSSL_set_timeout(WOLFSSL*, unsigned int); WOLFSSL_ABI WOLFSSL_API int wolfSSL_set_timeout(WOLFSSL*, unsigned int);
WOLFSSL_ABI WOLFSSL_API int wolfSSL_CTX_set_timeout(WOLFSSL_CTX*, unsigned int); WOLFSSL_ABI WOLFSSL_API int wolfSSL_CTX_set_timeout(WOLFSSL_CTX*, unsigned int);
WOLFSSL_API void wolfSSL_CTX_set_current_time_cb(WOLFSSL_CTX* ctx, WOLFSSL_API void wolfSSL_CTX_set_current_time_cb(WOLFSSL_CTX* ctx,
void (*cb)(const WOLFSSL* ssl, Timeval* out_clock)); void (*cb)(const WOLFSSL* ssl, WOLFSSL_TIMEVAL* out_clock));
/* get wolfSSL peer X509_CHAIN */ /* get wolfSSL peer X509_CHAIN */
WOLFSSL_API WOLFSSL_X509_CHAIN* wolfSSL_get_peer_chain(WOLFSSL* ssl); WOLFSSL_API WOLFSSL_X509_CHAIN* wolfSSL_get_peer_chain(WOLFSSL* ssl);
@ -3091,9 +3092,9 @@ typedef int (*TimeoutCallBack)(TimeoutInfo*);
/* wolfSSL connect extension allowing HandShakeCallBack and/or TimeoutCallBack /* wolfSSL connect extension allowing HandShakeCallBack and/or TimeoutCallBack
for diagnostics */ for diagnostics */
WOLFSSL_API int wolfSSL_connect_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack, WOLFSSL_API int wolfSSL_connect_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack,
Timeval); WOLFSSL_TIMEVAL);
WOLFSSL_API int wolfSSL_accept_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack, WOLFSSL_API int wolfSSL_accept_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack,
Timeval); WOLFSSL_TIMEVAL);
#endif /* WOLFSSL_CALLBACKS */ #endif /* WOLFSSL_CALLBACKS */