apps: use get_cipher_any() instead of get_cipher() for commands that support these...

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15747)

diff --git a/apps/cms.c b/apps/cms.c
index 81112c5a38ccad9e7ea18e8908a582953deffb6e..58ce54e4543cfbbbcf928b9db3abf8ebed5376c0 100644 (file)
--- 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 5df5cb78ced33cad75d6f36f26f1202bca86fee0..1234a698922a2da1e53a90f434020847cd5dd0f1 100644 (file)
--- 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 ea71121fb421fbf7abf1fd3d98440701f587cce2..a2ff0b5be75c834894be863a74155e1f09b39f68 100644 (file)
--- 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)) {