From a89835f7e0e4f8155f658af486b93956feaae61d Mon Sep 17 00:00:00 2001 From: Pauli Date: Tue, 15 Jun 2021 14:07:25 +1000 Subject: apps: use get_cipher_any() instead of get_cipher() for commands that support these ciphers/modes Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/15747) --- apps/cms.c | 4 ++-- apps/pkcs12.c | 2 +- apps/smime.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/cms.c b/apps/cms.c index 81112c5a38..58ce54e454 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -725,11 +725,11 @@ int cms_main(int argc, char **argv) goto end; } if (ciphername != NULL) { - if (!opt_cipher(ciphername, &cipher)) + if (!opt_cipher_any(ciphername, &cipher)) goto end; } if (wrapname != NULL) { - if (!opt_cipher(wrapname, &wrap_cipher)) + if (!opt_cipher_any(wrapname, &wrap_cipher)) goto end; } diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 5df5cb78ce..1234a69892 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -364,7 +364,7 @@ int pkcs12_main(int argc, char **argv) goto end; if (ciphername != NULL) { - if (!opt_cipher(ciphername, &enc)) + if (!opt_cipher_any(ciphername, &enc)) goto opthelp; } if (export_pkcs12) { diff --git a/apps/smime.c b/apps/smime.c index ea71121fb4..a2ff0b5be7 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -367,7 +367,7 @@ int smime_main(int argc, char **argv) goto opthelp; } if (ciphername != NULL) { - if (!opt_cipher(ciphername, &cipher)) + if (!opt_cipher_any(ciphername, &cipher)) goto opthelp; } if (!(operation & SMIME_SIGNERS) && (skkeys != NULL || sksigners != NULL)) { -- cgit v1.2.3