diff options
| author | Pauli <pauli@openssl.org> | 2021-06-15 14:07:25 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-06-16 18:32:30 +1000 |
| commit | a89835f7e0e4f8155f658af486b93956feaae61d (patch) | |
| tree | 296732d3025684ced7d5c64d817c0aed6f2c0ea8 | |
| parent | fa8ff9e4e8e0937eb04bf16d0159c3aedbd33547 (diff) | |
apps: use get_cipher_any() instead of get_cipher() for commands that support these ciphers/modes
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15747)
| -rw-r--r-- | apps/cms.c | 4 | ||||
| -rw-r--r-- | apps/pkcs12.c | 2 | ||||
| -rw-r--r-- | 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)) { |