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/genpkey.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/genpkey.c')
| -rw-r--r-- | apps/genpkey.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/apps/genpkey.c b/apps/genpkey.c index 5cde41b98b..d327bcab07 100644 --- a/apps/genpkey.c +++ b/apps/genpkey.c @@ -70,7 +70,7 @@ int genpkey_main(int argc, char **argv) EVP_CIPHER *cipher = NULL; OPTION_CHOICE o; 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(); STACK_OF(OPENSSL_STRING) *keyopt = NULL; @@ -163,16 +163,9 @@ int genpkey_main(int argc, char **argv) goto end; } } - if (ciphername != NULL) { + if (ciphername != NULL) if (!opt_cipher(ciphername, &cipher) || do_param == 1) 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; |