aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2010-04-06 00:16:20 +0200
committerMatthias Andree <matthias.andree@gmx.de>2010-04-06 00:16:20 +0200
commit566be2787e2e5dea4ed95f389fdceec6bb62f671 (patch)
treeef374737d99557e2d9e9037bd3984e46f8cbb1ea
parentb73b77380d9939e2b47f5ca7d723a86bde06d657 (diff)
downloadfetchmail-566be2787e2e5dea4ed95f389fdceec6bb62f671.tar.gz
fetchmail-566be2787e2e5dea4ed95f389fdceec6bb62f671.tar.bz2
fetchmail-566be2787e2e5dea4ed95f389fdceec6bb62f671.zip
Call OpenSSL_add_all_algorithms().
To fix Debian Bug #576430, reported by Sjoerd Simons.
-rw-r--r--NEWS6
-rw-r--r--socket.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 1cdf7856..c52426ad 100644
--- a/NEWS
+++ b/NEWS
@@ -50,6 +50,12 @@ removed from a 6.4.0 or newer release.)
--------------------------------------------------------------------------------
+fetchmail-6.3.16 (not yet released):
+
+# BUG FIXES
+* Call OpenSSL_add_all_algorithms(). Sjoerd Simons, to fix Debian Bug #576430.
+ Not that OpenSSL would document this in any findable or useful way :-(
+
fetchmail-6.3.15 (released 2010-03-28, 25572 LoC):
# FEATURE
diff --git a/socket.c b/socket.c
index 901e2e42..e5c52104 100644
--- a/socket.c
+++ b/socket.c
@@ -822,8 +822,8 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck
SSL_load_error_strings();
SSL_library_init();
-
-#ifdef SSL_ENABLE
+ OpenSSL_add_all_algorithms(); /* see Debian Bug#576430 and manpage */
+
if (stat("/dev/random", &randstat) &&
stat("/dev/urandom", &randstat)) {
/* Neither /dev/random nor /dev/urandom are present, so add
@@ -839,8 +839,6 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck
RAND_add (buf, sizeof buf, 0.1);
}
}
-#endif /* SSL_ENABLE */
-
if( sock < 0 || (unsigned)sock > FD_SETSIZE ) {
report(stderr, GT_("File descriptor out of range for SSL") );