[Commits] [SCM] claws branch, master, updated. 3.16.0-128-g32426d8

[wwp at claws-mail.org]

The branch, master has been updated
       via  32426d892c92cfb61dfb5f7ba9811232c9400ab9 (commit)
      from  fe8e202bb23919b2990f88e7b334f82511d68771 (commit)

Summary of changes:
 src/plugins/spamassassin/libspamc.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 32426d892c92cfb61dfb5f7ba9811232c9400ab9
Author: wwp <wwp at free.fr>
Date:   Thu Apr 12 17:35:04 2018 +0200

    Disable SSLv3 in libspamc.c (patch from Debian spamassassin package).

diff --git a/src/plugins/spamassassin/libspamc.c b/src/plugins/spamassassin/libspamc.c
index 0be68e8..623c1ab 100644
--- a/src/plugins/spamassassin/libspamc.c
+++ b/src/plugins/spamassassin/libspamc.c
@@ -1188,7 +1188,7 @@ int message_filter(struct transport *tp, const char *username,
     unsigned int throwaway;
     SSL_CTX *ctx = NULL;
     SSL *ssl = NULL;
-    SSL_METHOD *meth;
+    const SSL_METHOD *meth;
     char zlib_on = 0;
     unsigned char *zlib_buf = NULL;
     int zlib_bufsiz = 0;
@@ -1214,11 +1214,7 @@ int message_filter(struct transport *tp, const char *username,
     if (flags & SPAMC_USE_SSL) {
 #ifdef SPAMC_SSL
 	SSLeay_add_ssl_algorithms();
-	if (flags & SPAMC_TLSV1) {
-	    meth = TLSv1_client_method();
-	} else {
-	    meth = SSLv3_client_method(); /* default */
-	}
+	meth = SSLv23_client_method();
 	SSL_load_error_strings();
 	ctx = SSL_CTX_new(meth);
 #else
@@ -1597,7 +1593,7 @@ int message_tell(struct transport *tp, const char *username, int flags,
     int failureval;
     SSL_CTX *ctx = NULL;
     SSL *ssl = NULL;
-    SSL_METHOD *meth;
+    const SSL_METHOD *meth;
 
     assert(tp != NULL);
     assert(m != NULL);
@@ -1605,7 +1601,7 @@ int message_tell(struct transport *tp, const char *username, int flags,
     if (flags & SPAMC_USE_SSL) {
 #ifdef SPAMC_SSL
 	SSLeay_add_ssl_algorithms();
-	meth = SSLv3_client_method();
+	meth = SSLv23_client_method();
 	SSL_load_error_strings();
 	ctx = SSL_CTX_new(meth);
 #else

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail