mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

apps: remove AEAD/mode checks that are now redundant

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15747)
This commit is contained in:
Pauli 2021-06-15 14:07:51 +10:00
parent a89835f7e0
commit f7d2427ac3
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/enc.c
View File

@ -300,14 +300,6 @@ int enc_main(int argc, char **argv)
if (!opt_cipher(ciphername, &cipher)) if (!opt_cipher(ciphername, &cipher))
goto opthelp; 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 (digestname != NULL) {
if (!opt_md(digestname, &dgst)) if (!opt_md(digestname, &dgst))
goto opthelp; goto opthelp;
@ -660,9 +652,9 @@ static void show_ciphers(const OBJ_NAME *name, void *arg)
/* Filter out ciphers that we cannot use */ /* Filter out ciphers that we cannot use */
cipher = EVP_get_cipherbyname(name->name); cipher = EVP_get_cipherbyname(name->name);
if (cipher == NULL || if (cipher == NULL
(EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0 || || (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0
EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE) || EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE)
return; return;
BIO_printf(dec->bio, "-%-25s", name->name); BIO_printf(dec->bio, "-%-25s", name->name);

11
apps/genpkey.c
View File

@ -70,7 +70,7 @@ int genpkey_main(int argc, char **argv)
EVP_CIPHER *cipher = NULL; EVP_CIPHER *cipher = NULL;
OPTION_CHOICE o; OPTION_CHOICE o;
int outformat = FORMAT_PEM, text = 0, ret = 1, rv, do_param = 0; int outformat = FORMAT_PEM, text = 0, ret = 1, rv, do_param = 0;
int private = 0, i, m; int private = 0, i;
OSSL_LIB_CTX *libctx = app_get0_libctx(); OSSL_LIB_CTX *libctx = app_get0_libctx();
STACK_OF(OPENSSL_STRING) *keyopt = NULL; STACK_OF(OPENSSL_STRING) *keyopt = NULL;
@ -163,16 +163,9 @@ int genpkey_main(int argc, char **argv)
goto end; goto end;
} }
} }
if (ciphername != NULL) { if (ciphername != NULL)
if (!opt_cipher(ciphername, &cipher) || do_param == 1) if (!opt_cipher(ciphername, &cipher) || do_param == 1)
goto opthelp; goto opthelp;
m = EVP_CIPHER_get_mode(cipher);
if (m == EVP_CIPH_GCM_MODE || m == EVP_CIPH_CCM_MODE
|| m == EVP_CIPH_XTS_MODE || m == EVP_CIPH_OCB_MODE) {
BIO_printf(bio_err, "%s: cipher mode not supported\n", prog);
goto end;
}
}
private = do_param ? 0 : 1; private = do_param ? 0 : 1;