Fix md_kt_size in mbed TLS when queried for size of "none"
PATCH 1/1 Fix md_kt_size in mbed TLS when queried for size of "none"
Previously this would error out with a M_FATAL message about cipher not known. Align the mbed TLS version to OpenSSL version and also remove unreachable code. This manifested in key_print2 running into this M_FATAL message when used with an AEAD cipher and verb 7.
--- src/openvpn/crypto_mbedtls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
src/openvpn/crypto_mbedtls.c +2 -2
@@ -809,11 +809,11 @@ md_kt_name(const char *mdname)unsigned char md_kt_size (const char *mdname) { -const mbedtls_md_info_t *kt =md_get (mdname); -if (NULL == kt) +if (!strcmp ("none" , mdname)) {return 0 ; } +const mbedtls_md_info_t *kt =md_get (mdname);return mbedtls_md_get_size (kt); }
Signature · 1 line
2.37.0 (Apple Git-136)
[Openvpn-devel] [PATCH applied] Re: Fix md_kt_size in mbed TLS when queried for size of none
Verified that this fixes the (mbedtls-only) crash I was seeing with --verb 7 - and verified again that it does not happen with OpenSSL builds:
Master Encrypt (cipher): 6359ae14 b7069ef7 ... Master Encrypt (hmac):
Master Decrypt (cipher): 5217f7a8 c3f80df5 ... Master Decrypt (hmac):
Your patch has been applied to the master branch.
commit 6ff2d63c7943b2d7e150c3934b4e789fb5d1e0c0
Author: Arne Schwabe Date: Wed Nov 9 12:52:08 2022 +0100
Fix md_kt_size in mbed TLS when queried for size of none
Signed-off-by: Arne Schwabe <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg25494.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering