]> git.ipfire.org Git - thirdparty/openvpn.git/commit
Make cipher_kt_name always return normalised cipher name
authorArne Schwabe <arne@rfc2549.org>
Fri, 5 Jun 2020 11:25:17 +0000 (13:25 +0200)
committerGert Doering <gert@greenie.muc.de>
Thu, 11 Jun 2020 15:52:11 +0000 (17:52 +0200)
commitff531767eafed263d7bd8243138fbb276215000d
treec20d242770ec7d7027b3f83c04d644ea4e6cc6da
parent0213f80ed72ad8b6bb43db3bbd72a66ec2e12fcd
Make cipher_kt_name always return normalised cipher name

The mbed TLS variant of the call already returned the normalised
name while the OpenSSL variant did not. On top of that, all calls but
one to cipher_kt_name were translate_cipher_name_to_openvpn. This commit
moves the call of translate_cipher_name_to_openvpn into cipher_kt_name
or avoids calling it twice in the case of mbed TLS.

The one case that did not translate_cipher_name_to_openvpn is an
internal ssl_openssl.c method that should call EVP_CIPHER_name anyway.

Also simplify cipher_name_cmp function that is only used by
openvpn --show-ciphers with the modified cipher_kt_name
function.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Steffan Karger <steffan@karger.me>
Message-Id: <20200605112519.22714-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19970.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
src/openvpn/crypto.c
src/openvpn/crypto_backend.h
src/openvpn/crypto_openssl.c
src/openvpn/options.c
src/openvpn/ssl_ncp.c