diff options
Diffstat (limited to '')
-rw-r--r-- | src/usr.bin/openssl/smime.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/usr.bin/openssl/smime.c b/src/usr.bin/openssl/smime.c index 46bfa08679..f9d7049ff9 100644 --- a/src/usr.bin/openssl/smime.c +++ b/src/usr.bin/openssl/smime.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: smime.c,v 1.20 2023/04/14 15:27:13 tb Exp $ */ | 1 | /* $OpenBSD: smime.c,v 1.21 2025/06/07 08:28:49 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | 3 | * project. |
4 | */ | 4 | */ |
@@ -271,7 +271,7 @@ static const struct option smime_options[] = { | |||
271 | }, | 271 | }, |
272 | { | 272 | { |
273 | .name = "aes256", | 273 | .name = "aes256", |
274 | .desc = "Encrypt PEM output with CBC AES", | 274 | .desc = "Encrypt PEM output with CBC AES (default)", |
275 | .type = OPTION_ARGV_FUNC, | 275 | .type = OPTION_ARGV_FUNC, |
276 | .opt.argvfunc = smime_opt_cipher, | 276 | .opt.argvfunc = smime_opt_cipher, |
277 | }, | 277 | }, |
@@ -313,7 +313,7 @@ static const struct option smime_options[] = { | |||
313 | #ifndef OPENSSL_NO_RC2 | 313 | #ifndef OPENSSL_NO_RC2 |
314 | { | 314 | { |
315 | .name = "rc2-40", | 315 | .name = "rc2-40", |
316 | .desc = "Encrypt with RC2-40 (default)", | 316 | .desc = "Encrypt with RC2-40", |
317 | .type = OPTION_ARGV_FUNC, | 317 | .type = OPTION_ARGV_FUNC, |
318 | .opt.argvfunc = smime_opt_cipher, | 318 | .opt.argvfunc = smime_opt_cipher, |
319 | }, | 319 | }, |
@@ -825,14 +825,8 @@ smime_main(int argc, char **argv) | |||
825 | } | 825 | } |
826 | 826 | ||
827 | if (cfg.operation == SMIME_ENCRYPT) { | 827 | if (cfg.operation == SMIME_ENCRYPT) { |
828 | if (cfg.cipher == NULL) { | 828 | if (cfg.cipher == NULL) |
829 | #ifndef OPENSSL_NO_RC2 | 829 | cfg.cipher = EVP_aes_256_cbc(); |
830 | cfg.cipher = EVP_rc2_40_cbc(); | ||
831 | #else | ||
832 | BIO_printf(bio_err, "No cipher selected\n"); | ||
833 | goto end; | ||
834 | #endif | ||
835 | } | ||
836 | if ((encerts = sk_X509_new_null()) == NULL) | 830 | if ((encerts = sk_X509_new_null()) == NULL) |
837 | goto end; | 831 | goto end; |
838 | while (*args != NULL) { | 832 | while (*args != NULL) { |