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_0_9_8za~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee14e33c3523e74089e524e0c0caf0d0242c6fa0;p=oweals%2Fopenssl.git

Change default cipher in smime app to des3.

PR#3357
(cherry picked from commit ca3ffd9670f2b589bf8cc04923f953e06d6fbc58)

Conflicts:

	doc/apps/smime.pod
---

diff --git a/apps/smime.c b/apps/smime.c
index 75804b8d7b..858e958b88 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -521,8 +521,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 1b0d4f9539..bc8f059085 100644
--- a/doc/apps/smime.pod
+++ b/doc/apps/smime.pod
@@ -135,8 +135,8 @@ to each certificate.
 =item B<-des -des3 -rc2-40 -rc2-64 -rc2-128 -aes128 -aes192 -aes256 -camellia128 -camellia192 -camellia256>
 
 the encryption algorithm to use. DES (56 bits), triple DES (168 bits),
-40, 64 or 128 bit RC2, 128, 192 or 256 bit AES, or 128, 192 or 256 bit Camellia respectively.  If not
-specified 40 bit RC2 is used. Only used with B<-encrypt>.
+40, 64 or 128 bit RC2, 128, 192 or 256 bit AES, or 128, 192 or 256 bit Camellia respectively.
+If not specified triple DES is used. Only used with B<-encrypt>.
 
 =item B<-nointern>