wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 03:07:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixups for problems discovered while testing for DTLS 1.3

Browse Source
This commit is contained in:
Anthony Hu
2022-12-06 11:30:23 -05:00
parent a6c98a11d9
commit 7935a11b3e
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/dtls13.c
View File

@ -117,6 +117,7 @@ typedef struct Dtls13RecordPlaintextHeader {
#define DTLS13_MIN_CIPHERTEXT 16 #define DTLS13_MIN_CIPHERTEXT 16
#define DTLS13_MIN_RTX_INTERVAL 1 #define DTLS13_MIN_RTX_INTERVAL 1
#ifndef NO_WOLFSSL_CLIENT
WOLFSSL_METHOD* wolfDTLSv1_3_client_method_ex(void* heap) WOLFSSL_METHOD* wolfDTLSv1_3_client_method_ex(void* heap)
{ {
WOLFSSL_METHOD* method; WOLFSSL_METHOD* method;
@ -131,6 +132,14 @@ WOLFSSL_METHOD* wolfDTLSv1_3_client_method_ex(void* heap)
return method; return method;
} }
WOLFSSL_METHOD* wolfDTLSv1_3_client_method(void)
{
return wolfDTLSv1_3_client_method_ex(NULL);
}
#endif /* !NO_WOLFSSL_CLIENT */
#ifndef NO_WOLFSSL_SERVER
WOLFSSL_METHOD* wolfDTLSv1_3_server_method_ex(void* heap) WOLFSSL_METHOD* wolfDTLSv1_3_server_method_ex(void* heap)
{ {
WOLFSSL_METHOD* method; WOLFSSL_METHOD* method;
@ -147,15 +156,11 @@ WOLFSSL_METHOD* wolfDTLSv1_3_server_method_ex(void* heap)
return method; return method;
} }
WOLFSSL_METHOD* wolfDTLSv1_3_client_method(void)
{
return wolfDTLSv1_3_client_method_ex(NULL);
}
WOLFSSL_METHOD* wolfDTLSv1_3_server_method(void) WOLFSSL_METHOD* wolfDTLSv1_3_server_method(void)
{ {
return wolfDTLSv1_3_server_method_ex(NULL); return wolfDTLSv1_3_server_method_ex(NULL);
} }
#endif /* !NO_WOLFSSL_SERVER */
int Dtls13RlAddPlaintextHeader(WOLFSSL* ssl, byte* out, int Dtls13RlAddPlaintextHeader(WOLFSSL* ssl, byte* out,
enum ContentType content_type, word16 length) enum ContentType content_type, word16 length)

9
src/sniffer.c
View File

@ -1184,10 +1184,11 @@ static void TraceSequence(word32 seq, int len)
/* Show sequence and payload length for Trace */ /* Show sequence and payload length for Trace */
static void TraceAck(word32 ack, word32 expected) static void TraceAck(word32 acknowledgement, word32 expected)
{ {
if (TraceOn) { if (TraceOn) {
XFPRINTF(TraceFile, "\tAck:%u Expected:%u\n", ack, expected); XFPRINTF(TraceFile, "\tAck:%u Expected:%u\n", acknowledgement,
expected);
} }
} }
@ -6258,6 +6259,10 @@ doPart:
sslFrame += rhSize; sslFrame += rhSize;
sslBytes -= rhSize; sslBytes -= rhSize;
break; break;
#ifdef WOLFSSL_DTLS13
case ack:
/* TODO */
#endif /* WOLFSSL_DTLS13 */
case no_type: case no_type:
default: default:
SetError(GOT_UNKNOWN_RECORD_STR, error, session, FATAL_ERROR_STATE); SetError(GOT_UNKNOWN_RECORD_STR, error, session, FATAL_ERROR_STATE);

5
src/tls13.c
View File

@ -10479,7 +10479,8 @@ int DoTls13HandShakeMsgType(WOLFSSL* ssl, byte* input, word32* inOutIdx,
ret = DoTls13KeyUpdate(ssl, input, inOutIdx, size); ret = DoTls13KeyUpdate(ssl, input, inOutIdx, size);
break; break;
#if defined(WOLFSSL_DTLS13) && !defined(WOLFSSL_NO_TLS12) #if defined(WOLFSSL_DTLS13) && !defined(WOLFSSL_NO_TLS12) && \
!defined(NO_WOLFSSL_CLIENT)
case hello_verify_request: case hello_verify_request:
WOLFSSL_MSG("processing hello verify request"); WOLFSSL_MSG("processing hello verify request");
ret = DoHelloVerifyRequest(ssl, input, inOutIdx, size); ret = DoHelloVerifyRequest(ssl, input, inOutIdx, size);
@ -11229,7 +11230,7 @@ int wolfSSL_disable_hrr_cookie(WOLFSSL* ssl)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#ifdef NO_WOLFSSL_SERVER #ifdef NO_WOLFSSL_SERVER
return SIDE_ERROR return SIDE_ERROR;
#else #else
if (ssl->options.side == WOLFSSL_CLIENT_END) if (ssl->options.side == WOLFSSL_CLIENT_END)
return SIDE_ERROR; return SIDE_ERROR;

4
tests/api.c
View File

@ -56041,7 +56041,9 @@ static int test_wolfSSL_dtls_bad_record(void) {
} }
#endif #endif
#if defined(WOLFSSL_DTLS13) && !defined(WOLFSSL_TLS13_IGNORE_AEAD_LIMITS) #if defined(WOLFSSL_DTLS13) && !defined(WOLFSSL_TLS13_IGNORE_AEAD_LIMITS) && \
!defined(NO_WOLFSSL_CLIENT) && !defined(NO_WOLFSSL_SERVER) && \
defined(HAVE_IO_TESTS_DEPENDENCIES)
static byte test_AEAD_fail_decryption = 0; static byte test_AEAD_fail_decryption = 0;
static byte test_AEAD_seq_num = 0; static byte test_AEAD_seq_num = 0;
static byte test_AEAD_done = 0; static byte test_AEAD_done = 0;