From 7e69c2049bfa2ca129a3441aea050bbbf9a90d83 Mon Sep 17 00:00:00 2001 From: Marco Oliverio Date: Tue, 1 Oct 2024 06:45:37 +0000 Subject: [PATCH] dtls cid: address reviewer's comments --- src/ssl.c | 10 +++++++++- src/tls.c | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index 98f1b80f2..c65d6ecc6 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -4850,7 +4850,7 @@ int wolfSSL_GetVersion(const WOLFSSL* ssl) if (ssl == NULL) return BAD_FUNC_ARG; - if (ssl->version.major == SSLv3_MAJOR || ssl->version.major == DTLS_MAJOR) { + if (ssl->version.major == SSLv3_MAJOR) { switch (ssl->version.minor) { case SSLv3_MINOR : return WOLFSSL_SSLV3; @@ -4862,6 +4862,13 @@ int wolfSSL_GetVersion(const WOLFSSL* ssl) return WOLFSSL_TLSV1_2; case TLSv1_3_MINOR : return WOLFSSL_TLSV1_3; + default: + break; + } + } +#ifdef WOLFSSL_DTLS + if (ssl->version.major == DTLS_MAJOR) { + switch (ssl->version.minor) { case DTLS_MINOR : return WOLFSSL_DTLSV1; case DTLSv1_2_MINOR : @@ -4872,6 +4879,7 @@ int wolfSSL_GetVersion(const WOLFSSL* ssl) break; } } +#endif /* WOLFSSL_DTLS */ return VERSION_ERROR; } diff --git a/src/tls.c b/src/tls.c index 71f1c3e81..ab77cc268 100644 --- a/src/tls.c +++ b/src/tls.c @@ -913,8 +913,8 @@ static int Hmac_OuterHash(Hmac* hmac, unsigned char* mac) (word32)digestSz); if (ret == 0) ret = wc_HashFinal(&hash, hashType, mac); + wc_HashFree(&hash, hashType); } - wc_HashFree(&hash, hashType); return ret; }