summaryrefslogblamecommitdiff
path: root/system/mailx/openssl-1.1.patch
blob: 0c41ff1d63f76a6ebe0090ba754f806f7cd7d4c3 (plain) (tree)










































                                                                            
Remove EGD support no longer present in 1.1.

Remove SSLv3 support.

--- mailx-12.4/openssl.c.old	2020-01-15 02:20:57.711188031 +0000
+++ mailx-12.4/openssl.c	2020-01-15 02:34:43.412879382 +0000
@@ -130,15 +130,7 @@
 	char *cp;
 	int state = 0;
 
-	if ((cp = value("ssl-rand-egd")) != NULL) {
-		cp = expand(cp);
-		if (RAND_egd(cp) == -1) {
-			fprintf(stderr, catgets(catd, CATSET, 245,
-				"entropy daemon at \"%s\" not available\n"),
-					cp);
-		} else
-			state = 1;
-	} else if ((cp = value("ssl-rand-file")) != NULL) {
+	if ((cp = value("ssl-rand-file")) != NULL) {
 		cp = expand(cp);
 		if (RAND_load_file(cp, 1024) == -1) {
 			fprintf(stderr, catgets(catd, CATSET, 246,
@@ -156,6 +148,8 @@
 			}
 			state = 1;
 		}
+	} else {
+		RAND_poll();
 	}
 	return state;
 }
@@ -211,9 +205,7 @@
 
 	cp = ssl_method_string(uhp);
 	if (cp != NULL) {
-		if (equal(cp, "ssl3"))
-			method = SSLv3_client_method();
-		else if (equal(cp, "tls1"))
+		if (equal(cp, "tls1"))
 			method = TLSv1_client_method();
 		else {
 			fprintf(stderr, catgets(catd, CATSET, 244,