From f7d2427ac3404ce1ed555bf61885eeb0432b5789 Mon Sep 17 00:00:00 2001 From: Pauli Date: Tue, 15 Jun 2021 14:07:51 +1000 Subject: apps: remove AEAD/mode checks that are now redundant Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/15747) --- apps/enc.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'apps/enc.c') diff --git a/apps/enc.c b/apps/enc.c index f136c3f8df..3dd6098563 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -300,14 +300,6 @@ int enc_main(int argc, char **argv) if (!opt_cipher(ciphername, &cipher)) goto opthelp; } - if (cipher && EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) { - BIO_printf(bio_err, "%s: AEAD ciphers not supported\n", prog); - goto end; - } - if (cipher && (EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE)) { - BIO_printf(bio_err, "%s XTS ciphers not supported\n", prog); - goto end; - } if (digestname != NULL) { if (!opt_md(digestname, &dgst)) goto opthelp; @@ -660,9 +652,9 @@ static void show_ciphers(const OBJ_NAME *name, void *arg) /* Filter out ciphers that we cannot use */ cipher = EVP_get_cipherbyname(name->name); - if (cipher == NULL || - (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0 || - EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE) + if (cipher == NULL + || (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0 + || EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE) return; BIO_printf(dec->bio, "-%-25s", name->name); -- cgit v1.2.3