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

Remove debugging printfs. Added some guards around DTLS and AEAD only things.

Browse Source
This commit is contained in:
John Safranek
2021-10-26 13:59:14 -07:00
parent be3b6b47ef
commit 9f3f9c53fd
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/internal.c
View File

@ -8663,7 +8663,6 @@ 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;
@ -9187,7 +9186,6 @@ 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;
} }
@ -19377,15 +19375,15 @@ int IsSCR(WOLFSSL* ssl)
} }
#ifdef WOLFSSL_DTLS
static int ModifyForMTU(WOLFSSL* ssl, int buffSz, int outputSz, int mtuSz) static int ModifyForMTU(WOLFSSL* ssl, int buffSz, int outputSz, int mtuSz)
{ {
int overflowSz = outputSz - mtuSz; int overflowSz = outputSz - mtuSz;
printf("buffSz before = %d, ", buffSz); (void)ssl;
if (overflowSz > 0) {
int overheadSz = outputSz - buffSz;
printf("overheadSz = %d, ", overheadSz);
if (overflowSz > 0) {
#ifndef WOLFSSL_AEAD_ONLY
if (ssl->specs.cipher_type == block) { if (ssl->specs.cipher_type == block) {
int overflowBlocks = (overflowSz / ssl->specs.block_size); int overflowBlocks = (overflowSz / ssl->specs.block_size);
@ -19396,6 +19394,10 @@ static int ModifyForMTU(WOLFSSL* ssl, int buffSz, int outputSz, int mtuSz)
else { else {
buffSz -= overflowSz; buffSz -= overflowSz;
} }
#else
buffSz -= overflowSz;
#endif
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (ssl->options.dtls) if (ssl->options.dtls)
buffSz -= DTLS_HANDSHAKE_HEADER_SZ; buffSz -= DTLS_HANDSHAKE_HEADER_SZ;
@ -19404,10 +19406,10 @@ static int ModifyForMTU(WOLFSSL* ssl, int buffSz, int outputSz, int mtuSz)
buffSz -= HANDSHAKE_HEADER_SZ; buffSz -= HANDSHAKE_HEADER_SZ;
} }
printf("after = %d\n", buffSz);
return buffSz; return buffSz;
} }
#endif
int SendData(WOLFSSL* ssl, const void* data, int sz) int SendData(WOLFSSL* ssl, const void* data, int sz)
@ -19519,12 +19521,6 @@ int SendData(WOLFSSL* ssl, const void* data, int sz)
buffSz -= HANDSHAKE_HEADER_SZ; buffSz -= HANDSHAKE_HEADER_SZ;
} }
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 (sent == sz) break;
@ -32412,7 +32408,6 @@ int wolfSSL_GetMaxFragSize(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;
} }