[patch] spamassassin-3.4.1-openssl-1.1-p2.patch

spamassassin-3.4.1-openssl-1.1-p2.patch (text/plain), 1.12 KB, created by Mark Wright on 2017-10-20 02:40:23 UTC

--- Mail-SpamAssassin-3.4.1-orig/spamc/libspamc.c	2017-10-20 13:33:54.129653171 +1100
+++ Mail-SpamAssassin-3.4.1/spamc/libspamc.c	2017-10-20 13:36:09.429653849 +1100
@@ -1212,10 +1212,21 @@
 
     if (flags & SPAMC_USE_SSL) {
 #ifdef SPAMC_SSL
+#if OPENSSL_API_COMPAT >= 0x10100000L
+	OPENSSL_init_ssl(0, NULL);
+	meth = TLS_method();
+	ctx = SSL_CTX_new(meth);
+	if (flags & SPAMC_TLSV1) {
+	    SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
+	} else {
+	    SSL_CTX_set_min_proto_version(ctx, SSL3_VERSION);
+	}
+#else
 	SSLeay_add_ssl_algorithms();
 	meth = SSLv23_client_method();
 	SSL_load_error_strings();
 	ctx = SSL_CTX_new(meth);
+#endif
 #else
 	UNUSED_VARIABLE(ssl);
 	UNUSED_VARIABLE(meth);
@@ -1599,10 +1610,17 @@
 
     if (flags & SPAMC_USE_SSL) {
 #ifdef SPAMC_SSL
+#if OPENSSL_API_COMPAT >= 0x10100000L
+	OPENSSL_init_ssl(0, NULL);
+	meth = TLS_method();
+	ctx = SSL_CTX_new(meth);
+	SSL_CTX_set_min_proto_version(ctx, SSL3_VERSION);
+#else
 	SSLeay_add_ssl_algorithms();
 	meth = SSLv23_client_method();
 	SSL_load_error_strings();
 	ctx = SSL_CTX_new(meth);
+#endif
 #else
 	UNUSED_VARIABLE(ssl);
 	UNUSED_VARIABLE(meth);