aboutsummaryrefslogtreecommitdiffstats
path: root/community/heirloom-mailx/openssl.patch
blob: 15767d2669a9eb41f2ed89276c455777135afde8 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
--- a/openssl.c.orig	2014-07-22 20:59:16.024655378 +0200
+++ b/openssl.c	2014-07-22 21:00:45.754482770 +0200
@@ -137,11 +137,13 @@ ssl_rand_init(void)
 
 	if ((cp = value("ssl-rand-egd")) != NULL) {
 		cp = expand(cp);
+#ifdef HAVE_OPENSSL_RAND_EGD
 		if (RAND_egd(cp) == -1) {
 			fprintf(stderr, catgets(catd, CATSET, 245,
 				"entropy daemon at \"%s\" not available\n"),
 					cp);
 		} else
+#endif
 			state = 1;
 	} else if ((cp = value("ssl-rand-file")) != NULL) {
 		cp = expand(cp);
@@ -216,9 +218,7 @@ ssl_select_method(const char *uhp)
 
 	cp = ssl_method_string(uhp);
 	if (cp != NULL) {
-		if (equal(cp, "ssl2"))
-			method = SSLv2_client_method();
-		else if (equal(cp, "ssl3"))
+		if (equal(cp, "ssl3"))
 			method = SSLv3_client_method();
 		else if (equal(cp, "tls1"))
 			method = TLSv1_client_method();

--- a/openssl.c.orig	2016-03-30 17:03:49.491514269 +0200
+++ b/openssl.c	2016-03-30 17:04:03.026491689 +0200
@@ -219,7 +219,7 @@ ssl_select_method(const char *uhp)
 	cp = ssl_method_string(uhp);
 	if (cp != NULL) {
 		if (equal(cp, "ssl3"))
-			method = SSLv3_client_method();
+			method = SSLv23_client_method();
 		else if (equal(cp, "tls1"))
 			method = TLSv1_client_method();
 		else {