diff --git a/doc/dox_comments/header_files/ssl.h b/doc/dox_comments/header_files/ssl.h index e04b8e335..1ba412f60 100644 --- a/doc/dox_comments/header_files/ssl.h +++ b/doc/dox_comments/header_files/ssl.h @@ -11278,7 +11278,7 @@ int wolfSSL_DeriveTlsKeys(unsigned char* key_data, word32 keyLen, \sa wolfSSL_accept_ex */ WOLFSSL_API int wolfSSL_connect_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack, - Timeval); + WOLFSSL_TIMEVAL); /*! \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 */ WOLFSSL_API int wolfSSL_accept_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack, - Timeval); + WOLFSSL_TIMEVAL); /*! \ingroup IO diff --git a/examples/client/client.c b/examples/client/client.c index 2d5e46718..de839b3e7 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -72,7 +72,7 @@ static int lng_index = 0; #ifdef WOLFSSL_CALLBACKS - Timeval timeout; + WOLFSSL_TIMEVAL timeout; static int handShakeCB(HandShakeInfo* info) { (void)info; diff --git a/examples/server/server.c b/examples/server/server.c index afada953a..7440d64df 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -81,7 +81,11 @@ int catastrophic = 0; /* Use with -x flag to still exit when an error is static int lng_index = 0; #ifdef WOLFSSL_CALLBACKS - Timeval srvTo; + #if !defined(NO_OLD_TIMEVAL_NAME) + Timeval srvTo; + #else + WOLFSSL_TIMEVAL srvTo; + #endif static int srvHandShakeCB(HandShakeInfo* info) { (void)info; @@ -1057,6 +1061,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args) (void)mcastID; (void)loadCertKeyIntoSSLObj; (void)overrideDateErrors; + (void)nonBlocking; #ifdef WOLFSSL_TIRTOS fdOpenSession(Task_self()); diff --git a/src/internal.c b/src/internal.c index e40a1220c..3907ec130 100644 --- a/src/internal.c +++ b/src/internal.c @@ -18596,7 +18596,7 @@ int PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo, word32 hashSigAlgoSz) TimeoutInfo* info = &ssl->timeoutInfo; if (info->numberPackets < (MAX_PACKETS_HANDSHAKE - 1)) { - Timeval currTime; + WOLFSSL_TIMEVAL currTime; /* may add name after */ if (name) { diff --git a/src/ssl.c b/src/ssl.c index 6b73d7ac8..1a832f9ee 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -11460,10 +11460,10 @@ int wolfSSL_dtls_get_current_timeout(WOLFSSL* ssl) return timeout; } -int wolfSSL_DTLSv1_get_timeout(WOLFSSL* ssl, Timeval* timeleft) +int wolfSSL_DTLSv1_get_timeout(WOLFSSL* ssl, WOLFSSL_TIMEVAL* timeleft) { if (ssl && timeleft) { - XMEMSET(timeleft, 0, sizeof(Timeval)); + XMEMSET(timeleft, 0, sizeof(WOLFSSL_TIMEVAL)); timeleft->tv_sec = ssl->dtls_timeout; } return 0; @@ -13576,13 +13576,13 @@ int wolfSSL_set_compression(WOLFSSL* ssl) static int wolfSSL_ex_wrapper(WOLFSSL* ssl, HandShakeCallBack hsCb, - TimeoutCallBack toCb, Timeval timeout) + TimeoutCallBack toCb, WOLFSSL_TIMEVAL timeout) { int ret = WOLFSSL_FATAL_ERROR; int oldTimerOn = 0; /* was timer already on */ - Timeval startTime; - Timeval endTime; - Timeval totalTime; + WOLFSSL_TIMEVAL startTime; + WOLFSSL_TIMEVAL endTime; + WOLFSSL_TIMEVAL totalTime; Itimerval myTimeout; Itimerval oldTimeout; /* if old timer adjust from total time to reset */ struct sigaction act, oact; @@ -13690,7 +13690,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) #ifndef NO_WOLFSSL_CLIENT int wolfSSL_connect_ex(WOLFSSL* ssl, HandShakeCallBack hsCb, - TimeoutCallBack toCb, Timeval timeout) + TimeoutCallBack toCb, WOLFSSL_TIMEVAL timeout) { WOLFSSL_ENTER("wolfSSL_connect_ex"); return wolfSSL_ex_wrapper(ssl, hsCb, toCb, timeout); @@ -13702,7 +13702,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) #ifndef NO_WOLFSSL_SERVER int wolfSSL_accept_ex(WOLFSSL* ssl, HandShakeCallBack hsCb, - TimeoutCallBack toCb,Timeval timeout) + TimeoutCallBack toCb, WOLFSSL_TIMEVAL timeout) { WOLFSSL_ENTER("wolfSSL_accept_ex"); return wolfSSL_ex_wrapper(ssl, hsCb, toCb, timeout); diff --git a/wolfssl/callbacks.h b/wolfssl/callbacks.h index c8801ca06..eed27293c 100644 --- a/wolfssl/callbacks.h +++ b/wolfssl/callbacks.h @@ -53,19 +53,21 @@ typedef struct handShakeInfo_st { #if defined(HAVE_SYS_TIME_H) && !defined(NO_TIMEVAL) - typedef struct timeval Timeval; + typedef struct timeval WOLFSSL_TIMEVAL; #else /* HAVE_SYS_TIME_H */ - /* Define the Timeval explicitly. */ + /* Define the timeval explicitly. */ typedef struct { long tv_sec; /* Seconds. */ long tv_usec; /* Microseconds. */ - } Timeval; + } WOLFSSL_TIMEVAL; #endif /* HAVE_SYS_TIME_H */ - +#if !defined(NO_OLD_TIMEVAL_NAME) + #define Timeval WOLFSSL_TIMEVAL +#endif typedef struct packetInfo_st { 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* bufferValue; /* otherwise here (non 0) */ int valueSz; /* sz of value or buffer */ @@ -77,7 +79,7 @@ typedef struct timeoutInfo_st { int flags; /* for future use */ int numberPackets; /* actual # of packets */ PacketInfo packets[MAX_PACKETS_HANDSHAKE]; /* list of all packets */ - Timeval timeoutValue; /* timer that caused it */ + WOLFSSL_TIMEVAL timeoutValue; /* timer that caused it */ } TimeoutInfo; diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index a1e01a126..28a1fce22 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -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 */ #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_set_initial_timeout_duration wolfSSL_DTLSv1_set_initial_timeout_duration diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index e52b395dc..236d2d797 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -987,7 +987,8 @@ WOLFSSL_API int wolfSSL_dtls_get_using_nonblock(WOLFSSL*); #define wolfSSL_get_using_nonblock wolfSSL_dtls_get_using_nonblock /* The old names are deprecated. */ 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, word32 duration_ms); 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_CTX_set_timeout(WOLFSSL_CTX*, unsigned int); 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 */ 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 for diagnostics */ WOLFSSL_API int wolfSSL_connect_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack, - Timeval); + WOLFSSL_TIMEVAL); WOLFSSL_API int wolfSSL_accept_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack, - Timeval); + WOLFSSL_TIMEVAL); #endif /* WOLFSSL_CALLBACKS */