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

dtls13: aesthetic only changes

Browse Source
This commit is contained in:
Marco Oliverio
2022-07-13 11:22:23 +02:00
committed by David Garske
parent b5ce0b021e
commit 07afc594a8
1 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/dtls13.c
View File

@@ -796,7 +796,8 @@ static int Dtls13RtxMsgRecvd(WOLFSSL* ssl, enum HandShakeType hs,
Dtls13RtxRemoveCurAck(ssl); Dtls13RtxRemoveCurAck(ssl);
} }
if (ssl->options.dtls13SendMoreAcks && Dtls13DetectDisruption(ssl, fragOffset)) { if (ssl->options.dtls13SendMoreAcks &&
Dtls13DetectDisruption(ssl, fragOffset)) {
WOLFSSL_MSG("Disruption detected"); WOLFSSL_MSG("Disruption detected");
ssl->dtls13Rtx.sendAcks = 1; ssl->dtls13Rtx.sendAcks = 1;
} }
@@ -1416,40 +1417,40 @@ static int Dtls13RtxSendBuffered(WOLFSSL* ssl)
static int _Dtls13HandshakeRecv(WOLFSSL* ssl, byte* input, word32 size, static int _Dtls13HandshakeRecv(WOLFSSL* ssl, byte* input, word32 size,
word32* processedSize) word32* processedSize)
{ {
word32 frag_off, frag_length; word32 fragOff, fragLength;
byte isComplete, isFirst; byte isComplete, isFirst;
word32 message_length; word32 messageLength;
byte handshake_type; byte handshakeType;
word32 idx; word32 idx;
int ret; int ret;
idx = 0; idx = 0;
ret = GetDtlsHandShakeHeader(ssl, input, &idx, &handshake_type, ret = GetDtlsHandShakeHeader(ssl, input, &idx, &handshakeType,
&message_length, &frag_off, &frag_length, size); &messageLength, &fragOff, &fragLength, size);
if (ret != 0) if (ret != 0)
return PARSE_ERROR; return PARSE_ERROR;
if (idx + frag_length > size) { if (idx + fragLength > size) {
WOLFSSL_ERROR(INCOMPLETE_DATA); WOLFSSL_ERROR(INCOMPLETE_DATA);
return INCOMPLETE_DATA; return INCOMPLETE_DATA;
} }
if (frag_off + frag_length > message_length) if (fragOff + fragLength > messageLength)
return BUFFER_ERROR; return BUFFER_ERROR;
if (handshake_type == client_hello && if (handshakeType == client_hello &&
/* Only when receiving an unverified ClientHello */ /* Only when receiving an unverified ClientHello */
ssl->options.serverState < SERVER_HELLO_COMPLETE) { ssl->options.serverState < SERVER_HELLO_COMPLETE) {
/* To be able to operate in stateless mode, we assume the ClientHello /* To be able to operate in stateless mode, we assume the ClientHello
* is in order and we use its Handshake Message number and Sequence * is in order and we use its Handshake Message number and Sequence
* Number for our Tx. */ * Number for our Tx. */
ssl->keys.dtls_expected_peer_handshake_number = ssl->keys.dtls_expected_peer_handshake_number =
ssl->keys.dtls_handshake_number = ssl->keys.dtls_handshake_number =
ssl->keys.dtls_peer_handshake_number; ssl->keys.dtls_peer_handshake_number;
ssl->dtls13Epochs[0].nextSeqNumber = ssl->keys.curSeq; ssl->dtls13Epochs[0].nextSeqNumber = ssl->keys.curSeq;
} }
ret = Dtls13RtxMsgRecvd(ssl, (enum HandShakeType)handshake_type, frag_off); ret = Dtls13RtxMsgRecvd(ssl, (enum HandShakeType)handshakeType, fragOff);
if (ret != 0) if (ret != 0)
return ret; return ret;
@@ -1462,40 +1463,34 @@ static int _Dtls13HandshakeRecv(WOLFSSL* ssl, byte* input, word32 size,
#endif /* WOLFSSL_DEBUG_TLS */ #endif /* WOLFSSL_DEBUG_TLS */
/* ignore the message */ /* ignore the message */
*processedSize = idx + frag_length; *processedSize = idx + fragLength + ssl->keys.padSz;
*processedSize += ssl->keys.padSz;
return 0; return 0;
} }
isFirst = frag_off == 0; isFirst = fragOff == 0;
isComplete = isFirst && frag_length == message_length; isComplete = isFirst && fragLength == messageLength;
if (!isComplete || ssl->keys.dtls_peer_handshake_number > if (!isComplete || ssl->keys.dtls_peer_handshake_number >
ssl->keys.dtls_expected_peer_handshake_number) { ssl->keys.dtls_expected_peer_handshake_number) {
DtlsMsgStore(ssl, w64GetLow32(ssl->keys.curEpoch64), DtlsMsgStore(ssl, w64GetLow32(ssl->keys.curEpoch64),
ssl->keys.dtls_peer_handshake_number, ssl->keys.dtls_peer_handshake_number,
input + DTLS_HANDSHAKE_HEADER_SZ, message_length, handshake_type, input + DTLS_HANDSHAKE_HEADER_SZ, messageLength, handshakeType,
frag_off, frag_length, ssl->heap); fragOff, fragLength, ssl->heap);
*processedSize = idx + frag_length;
*processedSize += ssl->keys.padSz;
*processedSize = idx + fragLength + ssl->keys.padSz;
if (Dtls13NextMessageComplete(ssl)) if (Dtls13NextMessageComplete(ssl))
return Dtls13ProcessBufferedMessages(ssl); return Dtls13ProcessBufferedMessages(ssl);
return 0; return 0;
} }
ret = DoTls13HandShakeMsgType(ssl, input, &idx, handshake_type, ret = DoTls13HandShakeMsgType(ssl, input, &idx, handshakeType,
message_length, size); messageLength, size);
if (ret != 0) if (ret != 0)
return ret; return ret;
Dtls13MsgWasProcessed(ssl, (enum HandShakeType)handshake_type); Dtls13MsgWasProcessed(ssl, (enum HandShakeType)handshakeType);
*processedSize = idx; *processedSize = idx;
/* check if we have buffered some message */ /* check if we have buffered some message */