diff options
| author | Pauli <pauli@openssl.org> | 2021-06-15 14:07:51 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-06-16 18:32:30 +1000 |
| commit | f7d2427ac3404ce1ed555bf61885eeb0432b5789 (patch) | |
| tree | 697a4bbeab682a6cad038f2dce3aa4ba9da214e5 /apps/enc.c | |
| parent | a89835f7e0e4f8155f658af486b93956feaae61d (diff) | |
apps: remove AEAD/mode checks that are now redundant
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15747)
Diffstat (limited to 'apps/enc.c')
| -rw-r--r-- | apps/enc.c | 14 |
1 files changed, 3 insertions, 11 deletions
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); |