Skip to content

Commit 607e2ad

Browse files
committed
Fix CI
1 parent 29a1c54 commit 607e2ad

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

src/dtls13.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,7 +1895,7 @@ static int _Dtls13HandshakeRecv(WOLFSSL* ssl, byte* input, word32 size,
18951895
#endif /* WOLFSSL_DEBUG_TLS */
18961896

18971897
/* ignore the message */
1898-
*processedSize = idx + fragLength + ssl->keys.padSz;
1898+
*processedSize = idx + fragLength;
18991899

19001900
return 0;
19011901
}
@@ -1929,7 +1929,7 @@ static int _Dtls13HandshakeRecv(WOLFSSL* ssl, byte* input, word32 size,
19291929
WOLFSSL_MSG("DTLS1.3 not accepting fragmented plaintext message");
19301930
#endif /* WOLFSSL_DEBUG_TLS */
19311931
/* ignore the message */
1932-
*processedSize = idx + fragLength + ssl->keys.padSz;
1932+
*processedSize = idx + fragLength;
19331933
return 0;
19341934
}
19351935
}
@@ -1957,7 +1957,7 @@ static int _Dtls13HandshakeRecv(WOLFSSL* ssl, byte* input, word32 size,
19571957
return DTLS_TOO_MANY_FRAGMENTS_E;
19581958
}
19591959

1960-
*processedSize = idx + fragLength + ssl->keys.padSz;
1960+
*processedSize = idx + fragLength;
19611961
if (Dtls13NextMessageComplete(ssl))
19621962
return Dtls13ProcessBufferedMessages(ssl);
19631963

src/internal.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23199,7 +23199,8 @@ static int DoProcessReplyEx(WOLFSSL* ssl, int allowSocketErr)
2319923199
WOLFSSL_MSG("Dropping DTLS record outside receiving "
2320023200
"window");
2320123201
ssl->options.processReply = doProcessInit;
23202-
ssl->buffers.inputBuffer.idx += ssl->curSize;
23202+
ssl->buffers.inputBuffer.idx += ssl->curSize
23203+
+ ssl->keys.padSz;
2320323204
if (ssl->buffers.inputBuffer.idx >
2320423205
ssl->buffers.inputBuffer.length)
2320523206
return BUFFER_E;
@@ -23314,8 +23315,12 @@ static int DoProcessReplyEx(WOLFSSL* ssl, int allowSocketErr)
2331423315
exit */
2331523316
ssl->earlyData = no_early_data;
2331623317
ssl->options.processReply = doProcessInit;
23317-
if (ssl->options.clientInEarlyData)
23318+
if (ssl->options.clientInEarlyData) {
23319+
if (IsEncryptionOn(ssl, 0))
23320+
ssl->buffers.inputBuffer.idx +=
23321+
ssl->keys.padSz;
2331823322
return APP_DATA_READY;
23323+
}
2331923324
}
2332023325
#endif /* WOLFSSL_EARLY_DATA */
2332123326
if (ret == 0 ||
@@ -23361,8 +23366,12 @@ static int DoProcessReplyEx(WOLFSSL* ssl, int allowSocketErr)
2336123366
ssl->options.handShakeState == HANDSHAKE_DONE) {
2336223367
ssl->earlyData = no_early_data;
2336323368
ssl->options.processReply = doProcessInit;
23364-
if (ssl->options.clientInEarlyData)
23369+
if (ssl->options.clientInEarlyData) {
23370+
if (IsEncryptionOn(ssl, 0))
23371+
ssl->buffers.inputBuffer.idx +=
23372+
ssl->keys.padSz;
2336523373
return APP_DATA_READY;
23374+
}
2336623375
}
2336723376
#endif
2336823377
#else

0 commit comments

Comments
 (0)