aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-05-21 10:39:11 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-05-29 14:12:12 +0100
commit92e2dc11f3b5f32390e6c009caf6995088be926e (patch)
treedb9d9440d4db282f155ff5685e8e7e9aa071f877
parent5bcb4be17d34a5a11f20f128136062cfca18e6f6 (diff)
downloadopenssl-92e2dc11f3b5f32390e6c009caf6995088be926e.zip
openssl-92e2dc11f3b5f32390e6c009caf6995088be926e.tar.gz
openssl-92e2dc11f3b5f32390e6c009caf6995088be926e.tar.bz2
Change default cipher in smime app to des3.
PR#3357 (cherry picked from commit ca3ffd9670f2b589bf8cc04923f953e06d6fbc58)
-rw-r--r--apps/smime.c4
-rw-r--r--doc/apps/smime.pod2
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/smime.c b/apps/smime.c
index c583f8a0..d1fe32d 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -541,8 +541,8 @@ int MAIN(int argc, char **argv)
{
if (!cipher)
{
-#ifndef OPENSSL_NO_RC2
- cipher = EVP_rc2_40_cbc();
+#ifndef OPENSSL_NO_DES
+ cipher = EVP_des_ede3_cbc();
#else
BIO_printf(bio_err, "No cipher selected\n");
goto end;
diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod
index 3aa6e84..d39a59a 100644
--- a/doc/apps/smime.pod
+++ b/doc/apps/smime.pod
@@ -159,7 +159,7 @@ EVP_get_cipherbyname() function) can also be used preceded by a dash, for
example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for list of ciphers
supported by your version of OpenSSL.
-If not specified 40 bit RC2 is used. Only used with B<-encrypt>.
+If not specified triple DES is used. Only used with B<-encrypt>.
=item B<-nointern>