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

outputBuffer - use idx field

Browse Source 
dtls13.c:
Change end of outputBuffer data calculations to use function
GetOutputBuffer().
  Use idx when calculating unused byte count of outputBuffer.

internal.c:
Change end of outputBuffer data calculations to use function
GetOutputBuffer().
  Use GetOutputBuffer() to calculate end of data in outputBuffer.
  GrowOutputBuffer():
Calculate new size to allocate to include already written data in
case of static buffer.
    Copy all data including already written count (idx).
  CheckAvailableSize():
    Don't subtract idx from length when checking MTU size.
Do subtract idx from bufferSize to determine count of unused bytes
in outputBuffer.
This commit is contained in:
Sean Parkinson
2023-06-16 10:29:52 +10:00
parent 5b81dc47d2
commit beef8b0014
2 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/dtls13.c
View File

@ -419,7 +419,7 @@ static int Dtls13SendFragFromBuffer(WOLFSSL* ssl, byte* output, word16 length)
if (ret != 0) if (ret != 0)
return ret; return ret;
buf = ssl->buffers.outputBuffer.buffer + ssl->buffers.outputBuffer.length; buf = GetOutputBuffer(ssl);
XMEMCPY(buf, output, length); XMEMCPY(buf, output, length);
@ -924,8 +924,7 @@ static int Dtls13SendFragmentedInternal(WOLFSSL* ssl)
if (ret != 0) if (ret != 0)
return ret; return ret;
output = output = GetOutputBuffer(ssl);
ssl->buffers.outputBuffer.buffer + ssl->buffers.outputBuffer.length;
ret = Dtls13HandshakeAddHeaderFrag(ssl, output + rlHeaderLength, ret = Dtls13HandshakeAddHeaderFrag(ssl, output + rlHeaderLength,
(enum HandShakeType)ssl->dtls13FragHandshakeType, (enum HandShakeType)ssl->dtls13FragHandshakeType,
@ -1509,8 +1508,7 @@ static int Dtls13RtxSendBuffered(WOLFSSL* ssl)
if (ret != 0) if (ret != 0)
return ret; return ret;
output = output = GetOutputBuffer(ssl);
ssl->buffers.outputBuffer.buffer + ssl->buffers.outputBuffer.length;
XMEMCPY(output + headerLength, r->data, r->length); XMEMCPY(output + headerLength, r->data, r->length);
@ -2342,8 +2340,7 @@ static int Dtls13WriteAckMessage(WOLFSSL* ssl,
if (ret != 0) if (ret != 0)
return ret; return ret;
output = output = GetOutputBuffer(ssl);
ssl->buffers.outputBuffer.buffer + ssl->buffers.outputBuffer.length;
ackMessage = output + headerLength; ackMessage = output + headerLength;
@ -2617,8 +2614,7 @@ int SendDtls13Ack(WOLFSSL* ssl)
if (ret != 0) if (ret != 0)
return ret; return ret;
output = output = GetOutputBuffer(ssl);
ssl->buffers.outputBuffer.buffer + ssl->buffers.outputBuffer.length;
ret = Dtls13RlAddPlaintextHeader(ssl, output, ack, (word16)length); ret = Dtls13RlAddPlaintextHeader(ssl, output, ack, (word16)length);
if (ret != 0) if (ret != 0)
@ -2632,10 +2628,10 @@ int SendDtls13Ack(WOLFSSL* ssl)
if (ret != 0) if (ret != 0)
return ret; return ret;
output = output = GetOutputBuffer(ssl);
ssl->buffers.outputBuffer.buffer + ssl->buffers.outputBuffer.length;
outputSize = ssl->buffers.outputBuffer.bufferSize - outputSize = ssl->buffers.outputBuffer.bufferSize -
ssl->buffers.outputBuffer.idx -
ssl->buffers.outputBuffer.length; ssl->buffers.outputBuffer.length;
headerSize = Dtls13GetRlHeaderLength(ssl, 1); headerSize = Dtls13GetRlHeaderLength(ssl, 1);

41
src/internal.c
View File

@ -8967,10 +8967,7 @@ int DtlsMsgPoolSend(WOLFSSL* ssl, int sendOnlyFirstPacket)
return ret; return ret;
} }
XMEMCPY(ssl->buffers.outputBuffer.buffer + XMEMCPY(GetOutputBuffer(ssl), pool->raw, pool->sz);
ssl->buffers.outputBuffer.idx +
ssl->buffers.outputBuffer.length,
pool->raw, pool->sz);
ssl->buffers.outputBuffer.length += pool->sz; ssl->buffers.outputBuffer.length += pool->sz;
} }
else { else {
@ -9950,6 +9947,7 @@ void ShrinkOutputBuffer(WOLFSSL* ssl)
ssl->buffers.outputBuffer.bufferSize = STATIC_BUFFER_LEN; ssl->buffers.outputBuffer.bufferSize = STATIC_BUFFER_LEN;
ssl->buffers.outputBuffer.dynamicFlag = 0; ssl->buffers.outputBuffer.dynamicFlag = 0;
ssl->buffers.outputBuffer.offset = 0; ssl->buffers.outputBuffer.offset = 0;
/* idx and length are assumed to be 0. */
} }
@ -10091,6 +10089,8 @@ static WC_INLINE int GrowOutputBuffer(WOLFSSL* ssl, int size)
#else #else
const byte align = WOLFSSL_GENERAL_ALIGNMENT; const byte align = WOLFSSL_GENERAL_ALIGNMENT;
#endif #endif
int newSz = size + ssl->buffers.outputBuffer.idx +
ssl->buffers.outputBuffer.length;
#if WOLFSSL_GENERAL_ALIGNMENT > 0 #if WOLFSSL_GENERAL_ALIGNMENT > 0
/* the encrypted data will be offset from the front of the buffer by /* the encrypted data will be offset from the front of the buffer by
@ -10101,8 +10101,7 @@ static WC_INLINE int GrowOutputBuffer(WOLFSSL* ssl, int size)
align *= 2; align *= 2;
#endif #endif
tmp = (byte*)XMALLOC(size + ssl->buffers.outputBuffer.length + align, tmp = (byte*)XMALLOC(newSz + align, ssl->heap, DYNAMIC_TYPE_OUT_BUFFER);
ssl->heap, DYNAMIC_TYPE_OUT_BUFFER);
WOLFSSL_MSG("growing output buffer"); WOLFSSL_MSG("growing output buffer");
if (tmp == NULL) if (tmp == NULL)
@ -10117,14 +10116,14 @@ static WC_INLINE int GrowOutputBuffer(WOLFSSL* ssl, int size)
/* can be from IO memory pool which does not need copy if same buffer */ /* can be from IO memory pool which does not need copy if same buffer */
if (ssl->buffers.outputBuffer.length && if (ssl->buffers.outputBuffer.length &&
tmp == ssl->buffers.outputBuffer.buffer) { tmp == ssl->buffers.outputBuffer.buffer) {
ssl->buffers.outputBuffer.bufferSize = ssl->buffers.outputBuffer.bufferSize = newSz;
size + ssl->buffers.outputBuffer.length;
return 0; return 0;
} }
#endif #endif
if (ssl->buffers.outputBuffer.length) if (ssl->buffers.outputBuffer.length)
XMEMCPY(tmp, ssl->buffers.outputBuffer.buffer, XMEMCPY(tmp, ssl->buffers.outputBuffer.buffer,
ssl->buffers.outputBuffer.idx +
ssl->buffers.outputBuffer.length); ssl->buffers.outputBuffer.length);
if (ssl->buffers.outputBuffer.dynamicFlag) { if (ssl->buffers.outputBuffer.dynamicFlag) {
@ -10142,8 +10141,7 @@ static WC_INLINE int GrowOutputBuffer(WOLFSSL* ssl, int size)
ssl->buffers.outputBuffer.offset = 0; ssl->buffers.outputBuffer.offset = 0;
ssl->buffers.outputBuffer.buffer = tmp; ssl->buffers.outputBuffer.buffer = tmp;
ssl->buffers.outputBuffer.bufferSize = size + ssl->buffers.outputBuffer.bufferSize = newSz;
ssl->buffers.outputBuffer.length;
return 0; return 0;
} }
@ -10241,8 +10239,7 @@ int CheckAvailableSize(WOLFSSL *ssl, int size)
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (ssl->options.dtls) { if (ssl->options.dtls) {
if (size + ssl->buffers.outputBuffer.length - if (size + ssl->buffers.outputBuffer.length >
ssl->buffers.outputBuffer.idx >
#if defined(WOLFSSL_SCTP) || defined(WOLFSSL_DTLS_MTU) #if defined(WOLFSSL_SCTP) || defined(WOLFSSL_DTLS_MTU)
ssl->dtlsMtuSz ssl->dtlsMtuSz
#else #else
@ -10274,8 +10271,9 @@ int CheckAvailableSize(WOLFSSL *ssl, int size)
} }
#endif #endif
if (ssl->buffers.outputBuffer.bufferSize - ssl->buffers.outputBuffer.length if ((ssl->buffers.outputBuffer.bufferSize -
< (word32)size) { ssl->buffers.outputBuffer.length -
ssl->buffers.outputBuffer.idx) < (word32)size) {
if (GrowOutputBuffer(ssl, size) < 0) if (GrowOutputBuffer(ssl, size) < 0)
return MEMORY_E; return MEMORY_E;
} }
@ -21890,8 +21888,7 @@ int SendCertificateRequest(WOLFSSL* ssl)
return ret; return ret;
/* get output buffer */ /* get output buffer */
output = ssl->buffers.outputBuffer.buffer + output = GetOutputBuffer(ssl);
ssl->buffers.outputBuffer.length;
AddHeaders(output, reqSz, certificate_request, ssl); AddHeaders(output, reqSz, certificate_request, ssl);
@ -22049,8 +22046,7 @@ static int BuildCertificateStatus(WOLFSSL* ssl, byte type, buffer* status,
ssl->options.buildingMsg = 1; ssl->options.buildingMsg = 1;
if ((ret = CheckAvailableSize(ssl, sendSz)) == 0) { if ((ret = CheckAvailableSize(ssl, sendSz)) == 0) {
output = ssl->buffers.outputBuffer.buffer + output = GetOutputBuffer(ssl);
ssl->buffers.outputBuffer.length;
AddHeaders(output, length, certificate_status, ssl); AddHeaders(output, length, certificate_status, ssl);
@ -22646,8 +22642,7 @@ int SendData(WOLFSSL* ssl, const void* data, int sz)
return ssl->error = ret; return ssl->error = ret;
/* get output buffer */ /* get output buffer */
out = ssl->buffers.outputBuffer.buffer + out = GetOutputBuffer(ssl);
ssl->buffers.outputBuffer.length;
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
if (ssl->options.usingCompression) { if (ssl->options.usingCompression) {
@ -26429,8 +26424,7 @@ static int HashSkeData(WOLFSSL* ssl, enum wc_HashType hashType,
return ret; return ret;
/* get output buffer */ /* get output buffer */
output = ssl->buffers.outputBuffer.buffer + output = GetOutputBuffer(ssl);
ssl->buffers.outputBuffer.length;
AddHeaders(output, length, client_hello, ssl); AddHeaders(output, length, client_hello, ssl);
@ -29926,8 +29920,7 @@ int SendClientKeyExchange(WOLFSSL* ssl)
goto exit_scke; goto exit_scke;
/* get output buffer */ /* get output buffer */
args->output = ssl->buffers.outputBuffer.buffer + args->output = GetOutputBuffer(ssl);
ssl->buffers.outputBuffer.length;
AddHeaders(args->output, args->encSz + tlsSz, client_key_exchange, ssl); AddHeaders(args->output, args->encSz + tlsSz, client_key_exchange, ssl);