40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
--- 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 {
|