mirror of
git://slackware.nl/current.git
synced 2025-01-13 08:01:53 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
diff --git a/openssl.c b/openssl.c
|
|
index b4e33fc..9d1eaf4 100644
|
|
--- a/openssl.c
|
|
+++ b/openssl.c
|
|
@@ -136,6 +136,7 @@ ssl_rand_init(void)
|
|
int state = 0;
|
|
|
|
if ((cp = value("ssl-rand-egd")) != NULL) {
|
|
+#ifndef OPENSSL_NO_EGD
|
|
cp = expand(cp);
|
|
if (RAND_egd(cp) == -1) {
|
|
fprintf(stderr, catgets(catd, CATSET, 245,
|
|
@@ -143,6 +144,9 @@ ssl_rand_init(void)
|
|
cp);
|
|
} else
|
|
state = 1;
|
|
+#else
|
|
+ fprintf(stderr, "entropy daemon not available\n");
|
|
+#endif
|
|
} else if ((cp = value("ssl-rand-file")) != NULL) {
|
|
cp = expand(cp);
|
|
if (RAND_load_file(cp, 1024) == -1) {
|
|
@@ -216,9 +220,16 @@ ssl_select_method(const char *uhp)
|
|
|
|
cp = ssl_method_string(uhp);
|
|
if (cp != NULL) {
|
|
- if (equal(cp, "ssl2"))
|
|
+ if (equal(cp, "ssl2")) {
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000
|
|
method = SSLv2_client_method();
|
|
- else if (equal(cp, "ssl3"))
|
|
+#else
|
|
+ /* SSLv2 support was removed in OpenSSL 1.1.0 */
|
|
+ fprintf(stderr, catgets(catd, CATSET, 244,
|
|
+ "Unsupported SSL method \"%s\"\n"), cp);
|
|
+ method = SSLv23_client_method();
|
|
+#endif
|
|
+ } else if (equal(cp, "ssl3"))
|
|
method = SSLv3_client_method();
|
|
else if (equal(cp, "tls1"))
|
|
method = TLSv1_client_method();
|