From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 21 May 2014 09:39:11 +0000 (+0100)
Subject: Change default cipher in smime app to des3.
X-Git-Tag: OpenSSL_1_0_0m~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=92e2dc11f3b5f32390e6c009caf6995088be926e;p=oweals%2Fopenssl.git

Change default cipher in smime app to des3.

PR#3357
(cherry picked from commit ca3ffd9670f2b589bf8cc04923f953e06d6fbc58)
---

diff --git a/apps/smime.c b/apps/smime.c
index c583f8a0e1..d1fe32d31b 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 3aa6e848af..d39a59a90d 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>