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

Updating based on MTU. Debugging prints.

Browse Source
This commit is contained in:
John Safranek
2021-10-25 09:56:29 -07:00
parent be2e7e25ac
commit 77ebd11781
1 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/internal.c
View File

@@ -8663,6 +8663,7 @@ static int SendHandshakeMsg(WOLFSSL* ssl, byte* input, word32 inputSz,
int ret = 0; int ret = 0;
int headerSz; int headerSz;
printf("SendHandshakeMsg\n");
WOLFSSL_ENTER("SendHandshakeMsg"); WOLFSSL_ENTER("SendHandshakeMsg");
(void)type; (void)type;
(void)packetName; (void)packetName;
@@ -9186,6 +9187,7 @@ int CheckAvailableSize(WOLFSSL *ssl, int size)
ssl->dtls_expected_rx ssl->dtls_expected_rx
#endif #endif
) { ) {
printf("Size = %d, mtu = %d\n", size, ssl->dtls_expected_rx);
WOLFSSL_MSG("CheckAvailableSize() called with size greater than MTU."); WOLFSSL_MSG("CheckAvailableSize() called with size greater than MTU.");
return DTLS_SIZE_ERROR; return DTLS_SIZE_ERROR;
} }
@@ -19376,6 +19378,32 @@ int IsSCR(WOLFSSL* ssl)
} }
static int ModifyForMTU(WOLFSSL* ssl, int buffSz, int outputSz, int mtuSz)
{
int overflowSz = outputSz - mtuSz;
printf("buffSz before = %d, ", buffSz);
if (overflowSz > 0) {
int overheadSz = outputSz - buffSz;
printf("overheadSz = %d, ", overheadSz);
if (ssl->specs.cipher_type == block) {
int overflowBlocks = (overflowSz / ssl->specs.block_size);
if (overflowSz % ssl->specs.block_size != 0)
overflowBlocks++;
buffSz -= ssl->specs.block_size * overflowBlocks;
}
else {
buffSz -= overflowSz;
}
}
printf("after = %d\n", buffSz);
return buffSz;
}
int SendData(WOLFSSL* ssl, const void* data, int sz) int SendData(WOLFSSL* ssl, const void* data, int sz)
{ {
int sent = 0, /* plainText size */ int sent = 0, /* plainText size */
@@ -19471,9 +19499,15 @@ int SendData(WOLFSSL* ssl, const void* data, int sz)
byte comp[MAX_RECORD_SIZE + MAX_COMP_EXTRA]; byte comp[MAX_RECORD_SIZE + MAX_COMP_EXTRA];
#endif #endif
if (sent == sz) break;
buffSz = wolfSSL_GetMaxRecordSize(ssl, sz - sent); buffSz = wolfSSL_GetMaxRecordSize(ssl, sz - sent);
printf("sz - sent = %d, buffSz = %d\n", sz - sent, buffSz);
int i = ModifyForMTU(ssl, 1500,
BuildMessage(ssl, NULL, 0, NULL, 1500,
application_data, 0, 1, 0, CUR_ORDER), 1400);
printf("Modify = %d\n", i);
if (sent == sz) break;
#if defined(WOLFSSL_DTLS) && !defined(WOLFSSL_NO_DTLS_SIZE_CHECK) #if defined(WOLFSSL_DTLS) && !defined(WOLFSSL_NO_DTLS_SIZE_CHECK)
if (ssl->options.dtls && (buffSz < sz - sent)) { if (ssl->options.dtls && (buffSz < sz - sent)) {
@@ -32359,6 +32393,7 @@ int wolfSSL_GetMaxRecordSize(WOLFSSL* ssl, int maxFragment)
{ {
(void) ssl; /* Avoid compiler warnings */ (void) ssl; /* Avoid compiler warnings */
printf("start maxFragment = %d\n", maxFragment);
if (maxFragment > MAX_RECORD_SIZE) { if (maxFragment > MAX_RECORD_SIZE) {
maxFragment = MAX_RECORD_SIZE; maxFragment = MAX_RECORD_SIZE;
} }
@@ -32370,24 +32405,25 @@ int wolfSSL_GetMaxRecordSize(WOLFSSL* ssl, int maxFragment)
#endif /* HAVE_MAX_FRAGMENT */ #endif /* HAVE_MAX_FRAGMENT */
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsNotSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
int cipherExtra = IsEncryptionOn(ssl, 1) ? cipherExtraData(ssl) : 0; int outputSz, mtuSz;
if (maxFragment > MAX_UDP_SIZE) {
maxFragment = MAX_UDP_SIZE; /* Given a input buffer size of maxFragment, how big will the
* encrypted output be? */
if (IsEncryptionOn(ssl, 1)) {
outputSz = BuildMessage(ssl, NULL, 0, NULL, maxFragment,
application_data, 0, 1, 0, CUR_ORDER);
} }
if (maxFragment > MAX_MTU - COMP_EXTRA - DTLS_RECORD_HEADER_SZ - else {
DTLS_HANDSHAKE_HEADER_SZ - cipherExtra) { outputSz = maxFragment + DTLS_RECORD_HEADER_SZ;
maxFragment = MAX_MTU - COMP_EXTRA - DTLS_RECORD_HEADER_SZ -
DTLS_HANDSHAKE_HEADER_SZ - cipherExtra;
} }
#if defined(WOLFSSL_DTLS_MTU)
{ /* Readjust maxFragment for MTU size. */
int overheadSz = DTLS_RECORD_HEADER_SZ + DTLS_HANDSHAKE_HEADER_SZ + #if defined(WOLFSSL_DTLS_MTU)
COMP_EXTRA + cipherExtra; mtuSz = ssl->dtlsMtuSz;
if (maxFragment > ssl->dtlsMtuSz - overheadSz) { #else
maxFragment = ssl->dtlsMtuSz - overheadSz; mtuSz = MAX_MTU;
} #endif
} maxFragment = ModifyForMTU(ssl, maxFragment, outputSz, mtuSz);
#endif
} }
#endif #endif