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

same fix to MicriumReceive

Browse Source
This commit is contained in:
Anthony Hu
2022-06-21 10:42:20 -04:00
parent 1e84d1eb67
commit ff4eabb17f
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/wolfio.c
View File

@@ -2128,20 +2128,40 @@ int MicriumReceive(WOLFSSL *ssl, char *buf, int sz, void *ctx)
NET_SOCK_RTN_CODE ret; NET_SOCK_RTN_CODE ret;
NET_ERR err; NET_ERR err;
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
{ {
int dtls_timeout = wolfSSL_dtls_get_current_timeout(ssl); int dtls_timeout = wolfSSL_dtls_get_current_timeout(ssl);
if (wolfSSL_dtls(ssl) /* Don't use ssl->options.handShakeDone since it is true even if
&& !wolfSSL_dtls_get_using_nonblock(ssl) * we are in the process of renegotiation */
&& dtls_timeout != 0) { byte doDtlsTimeout = ssl->options.handShakeState != HANDSHAKE_DONE;
#ifdef WOLFSSL_DTLS13
if (ssl->options.dtls && IsAtLeastTLSv1_3(ssl->version)) {
if (
doDtlsTimeout =
doDtlsTimeout || ssl->dtls13Rtx.rtxRecords != NULL ||
(ssl->dtls13FastTimeout && ssl->dtls13Rtx.seenRecords != NULL);
}
#endif /* WOLFSSL_DTLS13 */
if (!doDtlsTimeout)
dtls_timeout = 0;
if (!wolfSSL_dtls_get_using_nonblock(ssl)) {
/* needs timeout in milliseconds */ /* needs timeout in milliseconds */
#ifdef WOLFSSL_DTLS13
if (wolfSSL_dtls13_use_quick_timeout(ssl) &&
IsAtLeastTLSv1_3(ssl->version) && (dtls_timeout >= 4)) {
dtls_timeout = dtls_timeout / 4;
}
#endif /* WOLFSSL_DTLS13 */
NetSock_CfgTimeoutRxQ_Set(sd, dtls_timeout * 1000, &err); NetSock_CfgTimeoutRxQ_Set(sd, dtls_timeout * 1000, &err);
if (err != NET_SOCK_ERR_NONE) { if (err != NET_SOCK_ERR_NONE) {
WOLFSSL_MSG("NetSock_CfgTimeoutRxQ_Set failed"); WOLFSSL_MSG("NetSock_CfgTimeoutRxQ_Set failed");
} }
} }
} }
#endif #endif
ret = NetSock_RxData(sd, buf, sz, ssl->rflags, &err); ret = NetSock_RxData(sd, buf, sz, ssl->rflags, &err);
if (ret < 0) { if (ret < 0) {