![Adam Duskett](/assets/img/avatar_default.png)
Globally change Adam Duskett's email address to aduskett@gmail.com. Note that one or two of the patches may have been applied upstream with the old email address, but in that case those patches will anyway be removed when bumping. Signed-off-by: Adam Duskett <Aduskett@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From aad28d30af6c3a74c522dd61943788e908860c84 Mon Sep 17 00:00:00 2001
|
|
From: Adam Duskett <aduskett@gmail.com>
|
|
Date: Fri, 4 Aug 2017 07:22:47 -0400
|
|
Subject: [PATCH] fix libressl support
|
|
|
|
heirloom-mailx has two small issues when compiling against LibreSSL:
|
|
- RAND_egd is used (LibreSSL does not support RAND_egd)
|
|
Solution: "Guard" the code calling RAND_egd
|
|
|
|
- SSLv3_client_method function is used (LibreSSL does not support SSLv3)
|
|
Solution: "Guard" the code with #ifndef OPENSSL_NO_SSL3
|
|
|
|
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
|
---
|
|
openssl.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/openssl.c b/openssl.c
|
|
index 44fe4e5..c4a1bb7 100644
|
|
--- a/openssl.c
|
|
+++ b/openssl.c
|
|
@@ -137,11 +137,13 @@ ssl_rand_init(void)
|
|
|
|
if ((cp = value("ssl-rand-egd")) != NULL) {
|
|
cp = expand(cp);
|
|
+#ifndef OPENSSL_NO_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,10 +218,15 @@ ssl_select_method(const char *uhp)
|
|
|
|
cp = ssl_method_string(uhp);
|
|
if (cp != NULL) {
|
|
+ #ifndef OPENSSL_NO_SSL3
|
|
if (equal(cp, "ssl3"))
|
|
method = SSLv3_client_method();
|
|
else if (equal(cp, "tls1"))
|
|
method = TLSv1_client_method();
|
|
+ #else
|
|
+ if (equal(cp, "tls1"))
|
|
+ method = TLSv1_client_method();
|
|
+ #endif
|
|
else {
|
|
fprintf(stderr, catgets(catd, CATSET, 244,
|
|
"Invalid SSL method \"%s\"\n"), cp);
|
|
--
|
|
2.13.3
|
|
|