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

When attempting to send a message with DTLS, if it is too large, return an error rather than splitting it across records. (ZD 10602)

pull/3151/head
John Safranek 2020-07-20 16:14:53 -07:00
parent 29abd72c39
commit 5d5aa129ca
No known key found for this signature in database
GPG Key ID: 8CE817DE0D3CCB4A
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/internal.c
View File

@ -17709,9 +17709,11 @@ int SendData(WOLFSSL* ssl, const void* data, int sz)
len = wolfSSL_GetMaxRecordSize(ssl, sz - sent); len = wolfSSL_GetMaxRecordSize(ssl, sz - sent);
#ifdef WOLFSSL_DTLS #if defined(WOLFSSL_DTLS) && !defined(WOLFSSL_NO_DTLS_SIZE_CHECK)
if (IsDtlsNotSctpMode(ssl)) { if (ssl->options.dtls && (len < sz - sent)) {
len = min(len, MAX_UDP_SIZE); ssl->error = DTLS_SIZE_ERROR;
WOLFSSL_ERROR(ssl->error);
return ssl->error;
} }
#endif #endif
buffSz = len; buffSz = len;
@ -18439,6 +18441,9 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
case TLS13_SECRET_CB_E: case TLS13_SECRET_CB_E:
return "TLS1.3 Secret Callback Error"; return "TLS1.3 Secret Callback Error";
case DTLS_SIZE_ERROR:
return "DTLS trying to send too much in single datagram error";
default : default :
return "unknown error number"; return "unknown error number";
} }
@ -29977,7 +29982,7 @@ int wolfSSL_GetMaxRecordSize(WOLFSSL* ssl, int maxFragment)
} }
#endif /* HAVE_MAX_FRAGMENT */ #endif /* HAVE_MAX_FRAGMENT */
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if ((ssl->options.dtls) && (maxFragment > MAX_UDP_SIZE)) { if (IsDtlsNotSctpMode(ssl) && (maxFragment > MAX_UDP_SIZE)) {
maxFragment = MAX_UDP_SIZE; maxFragment = MAX_UDP_SIZE;
} }
#endif #endif

1
wolfssl/error-ssl.h
View File

@ -167,6 +167,7 @@ enum wolfSSL_ErrorCodes {
CLIENT_CERT_CB_ERROR = -436, /* Client cert callback error */ CLIENT_CERT_CB_ERROR = -436, /* Client cert callback error */
SSL_SHUTDOWN_ALREADY_DONE_E = -437, /* Shutdown called redundantly */ SSL_SHUTDOWN_ALREADY_DONE_E = -437, /* Shutdown called redundantly */
TLS13_SECRET_CB_E = -438, /* TLS1.3 secret Cb fcn failure */ TLS13_SECRET_CB_E = -438, /* TLS1.3 secret Cb fcn failure */
DTLS_SIZE_ERROR = -439, /* Trying to send too much data */
/* add strings to wolfSSL_ERR_reason_error_string in internal.c !!!!! */ /* add strings to wolfSSL_ERR_reason_error_string in internal.c !!!!! */