63 lines
1.6 KiB
Diff
63 lines
1.6 KiB
Diff
|
---
|
||
|
|
openssl.c | 29 ++++++++++++++++++++++++++---
|
||
|
|
1 file changed, 26 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- openssl.c
|
||
|
|
+++ openssl.c 2017-06-12 12:57:43.048652634 +0200
|
||
|
|
@@ -138,7 +138,12 @@ ssl_rand_init(void)
|
||
|
|
|
||
|
|
if ((cp = value("ssl-rand-egd")) != NULL) {
|
||
|
|
cp = expand(cp);
|
||
|
|
- if (RAND_egd(cp) == -1) {
|
||
|
|
+#ifndef OPENSSL_NO_EGD
|
||
|
|
+ if (RAND_egd(cp) == -1)
|
||
|
|
+#else
|
||
|
|
+ if (1)
|
||
|
|
+#endif
|
||
|
|
+ {
|
||
|
|
fprintf(stderr, catgets(catd, CATSET, 245,
|
||
|
|
"entropy daemon at \"%s\" not available\n"),
|
||
|
|
cp);
|
||
|
|
@@ -221,12 +226,13 @@ ssl_select_method(const char *uhp)
|
||
|
|
|
||
|
|
cp = ssl_method_string(uhp);
|
||
|
|
if (cp != NULL) {
|
||
|
|
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL
|
||
|
|
#ifndef OPENSSL_NO_SSL2
|
||
|
|
if (equal(cp, "ssl2"))
|
||
|
|
method = SSLv2_client_method();
|
||
|
|
else
|
||
|
|
-#endif
|
||
|
|
- if (equal(cp, "ssl3"))
|
||
|
|
+#endif
|
||
|
|
+ if (equal(cp, "ssl3"))
|
||
|
|
method = SSLv3_client_method();
|
||
|
|
else if (equal(cp, "tls1"))
|
||
|
|
method = TLSv1_client_method();
|
||
|
|
@@ -235,8 +241,25 @@ ssl_select_method(const char *uhp)
|
||
|
|
"Invalid SSL method \"%s\"\n"), cp);
|
||
|
|
method = SSLv23_client_method();
|
||
|
|
}
|
||
|
|
+#else
|
||
|
|
+ method = NULL;
|
||
|
|
+ if (equal(cp, "tls"))
|
||
|
|
+ method = TLS_client_method();
|
||
|
|
+ else if (equal(cp, "dtls"))
|
||
|
|
+ method = DTLS_client_method();
|
||
|
|
+
|
||
|
|
+ if (!method) {
|
||
|
|
+ fprintf(stderr, catgets(catd, CATSET, 244,
|
||
|
|
+ "Invalid SSL method \"%s\"\n"), cp);
|
||
|
|
+ method = TLS_client_method();
|
||
|
|
+ }
|
||
|
|
+#endif
|
||
|
|
} else
|
||
|
|
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL
|
||
|
|
method = SSLv23_client_method();
|
||
|
|
+#else
|
||
|
|
+ method = TLS_client_method();
|
||
|
|
+#endif
|
||
|
|
return method;
|
||
|
|
}
|
||
|
|
|