1*4882a593SmuzhiyunFrom: Hilko Bengen <bengen@debian.org>
2*4882a593SmuzhiyunDate: Wed, 27 Apr 2011 00:18:42 +0200
3*4882a593SmuzhiyunSubject: Patched out SSL2 support since it is no longer supported by OpenSSL.
4*4882a593Smuzhiyun
5*4882a593SmuzhiyunNow that openssl has dropped SSLv2 support we need to patch it out.
6*4882a593SmuzhiyunPatch picked up from debian patchseries 5.
7*4882a593Smuzhiyun
8*4882a593SmuzhiyunSigned-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
9*4882a593Smuzhiyun
10*4882a593Smuzhiyun---
11*4882a593Smuzhiyun mailx.1   |    2 +-
12*4882a593Smuzhiyun openssl.c |    4 +---
13*4882a593Smuzhiyun 2 files changed, 2 insertions(+), 4 deletions(-)
14*4882a593Smuzhiyun
15*4882a593Smuzhiyundiff --git a/mailx.1 b/mailx.1
16*4882a593Smuzhiyunindex 417ea04..a02e430 100644
17*4882a593Smuzhiyun--- a/mailx.1
18*4882a593Smuzhiyun+++ b/mailx.1
19*4882a593Smuzhiyun@@ -3575,7 +3575,7 @@ Only applicable if SSL/TLS support is built using OpenSSL.
20*4882a593Smuzhiyun .TP
21*4882a593Smuzhiyun .B ssl-method
22*4882a593Smuzhiyun Selects a SSL/TLS protocol version;
23*4882a593Smuzhiyun-valid values are `ssl2', `ssl3', and `tls1'.
24*4882a593Smuzhiyun+valid values are `ssl3', and `tls1'.
25*4882a593Smuzhiyun If unset, the method is selected automatically,
26*4882a593Smuzhiyun if possible.
27*4882a593Smuzhiyun .TP
28*4882a593Smuzhiyundiff --git a/openssl.c b/openssl.c
29*4882a593Smuzhiyunindex b4e33fc..44fe4e5 100644
30*4882a593Smuzhiyun--- a/openssl.c
31*4882a593Smuzhiyun+++ b/openssl.c
32*4882a593Smuzhiyun@@ -216,9 +216,7 @@ ssl_select_method(const char *uhp)
33*4882a593Smuzhiyun
34*4882a593Smuzhiyun 	cp = ssl_method_string(uhp);
35*4882a593Smuzhiyun 	if (cp != NULL) {
36*4882a593Smuzhiyun-		if (equal(cp, "ssl2"))
37*4882a593Smuzhiyun-			method = SSLv2_client_method();
38*4882a593Smuzhiyun-		else if (equal(cp, "ssl3"))
39*4882a593Smuzhiyun+		if (equal(cp, "ssl3"))
40*4882a593Smuzhiyun 			method = SSLv3_client_method();
41*4882a593Smuzhiyun 		else if (equal(cp, "tls1"))
42*4882a593Smuzhiyun 			method = TLSv1_client_method();
43