diff options
| author | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
|---|---|---|
| committer | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
| commit | 9297468fa579836e3a6a381b798feb6b78217c2d (patch) | |
| tree | 53168212f427afbcf0693b534530a4af803152e9 /system/mailx/openssl-1.1.patch | |
| parent | a63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff) | |
| parent | da5a69b65a8791fffa6e93366ee585f87eff136d (diff) | |
| download | packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2 packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip | |
Merge branch 'master' into zfs
Diffstat (limited to 'system/mailx/openssl-1.1.patch')
| -rw-r--r-- | system/mailx/openssl-1.1.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/system/mailx/openssl-1.1.patch b/system/mailx/openssl-1.1.patch new file mode 100644 index 000000000..0c41ff1d6 --- /dev/null +++ b/system/mailx/openssl-1.1.patch @@ -0,0 +1,43 @@ +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, |