Attachment 165793 Details for Bug 206383 – imapfilter SSLv3 patch

[patch] imapfilter SSLv3 patch

patch-src__imapfilter.c (text/plain), 1.68 KB, created by Pierre Guinoiseau on 2016-01-19 04:03:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Guinoiseau

Created: 2016-01-19 04:03:00 UTC

Size: 1.68 KB

patch

obsolete

>From c470c45d1fcb9bf1d51e9ffba6c7be9186dcc6d2 Mon Sep 17 00:00:00 2001
>From: Lefteris Chatzimparmpas <lefcha@fastmail.net>
>Date: Sun, 17 Jan 2016 20:33:02 +0200
>Subject: [PATCH] Check whether SSLv3 is disabled.
>
>---
> src/imapfilter.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
>diff --git a/src/imapfilter.c b/src/imapfilter.c
>index 22a3196..defd0d5 100644
>--- a/src/imapfilter.c
>+++ b/src/imapfilter.c
>@@ -21,7 +21,10 @@
> 
> extern buffer ibuf, obuf, nbuf, cbuf;
> extern regexp responses[];
>-extern SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx;
>+extern SSL_CTX *ssl23ctx, *tls1ctx;
>+#ifndef OPENSSL_NO_SSL3_METHOD
>+extern SSL_CTX *ssl3ctx;
>+#endif
> #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
> extern SSL_CTX *tls11ctx, *tls12ctx;
> #endif
>@@ -114,7 +117,9 @@ main(int argc, char *argv[])
> 
> 	SSL_library_init();
> 	SSL_load_error_strings();
>+#ifndef OPENSSL_NO_SSL3_METHOD
> 	ssl3ctx = SSL_CTX_new(SSLv3_client_method());
>+#endif
> 	ssl23ctx = SSL_CTX_new(SSLv23_client_method());
> 	tls1ctx = SSL_CTX_new(TLSv1_client_method());
> #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
>@@ -125,7 +130,9 @@ main(int argc, char *argv[])
> 		capath = opts.truststore;
> 	else if (exists_file(opts.truststore))
> 		cafile = opts.truststore;
>+#ifndef OPENSSL_NO_SSL3_METHOD
> 	SSL_CTX_load_verify_locations(ssl3ctx, cafile, capath);
>+#endif
> 	SSL_CTX_load_verify_locations(ssl23ctx, cafile, capath);
> 	SSL_CTX_load_verify_locations(tls1ctx, cafile, capath);
> #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
>@@ -150,7 +157,9 @@ main(int argc, char *argv[])
> #endif
> 	stop_lua();
> 
>+#ifndef OPENSSL_NO_SSL3_METHOD
> 	SSL_CTX_free(ssl3ctx);
>+#endif
> 	SSL_CTX_free(ssl23ctx);
> 	SSL_CTX_free(tls1ctx);
> #if OPENSSL_VERSION_NUMBER >= 0x01000100fL

Flags:

bofh: maintainer-approval-

Actions: View | Diff

Attachments on bug 206383: 165781 | 165793