diff options
| author | Erich Eckner <git@eckner.net> | 2019-09-30 07:16:02 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-09-30 07:17:54 +0200 |
| commit | 6955cdae9b899bd51a725ffb5ca9444da39eb4be (patch) | |
| tree | 67eb6d7644e95446a6f3910abd1bbec513b51285 /fetchmail/disable-sslv3.patch | |
| parent | ff4da41eaf795d8479ce2ce0dcc5373aca0115e7 (diff) | |
| download | archlinuxewe.git.save-6955cdae9b899bd51a725ffb5ca9444da39eb4be.tar.xz | |
fetchmail 6.3.26-8 -> 6.4.1-1
Diffstat (limited to 'fetchmail/disable-sslv3.patch')
| -rw-r--r-- | fetchmail/disable-sslv3.patch | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/fetchmail/disable-sslv3.patch b/fetchmail/disable-sslv3.patch index 2edc41e2..7c4833af 100644 --- a/fetchmail/disable-sslv3.patch +++ b/fetchmail/disable-sslv3.patch @@ -1,20 +1,16 @@ -diff -u -r fetchmail-6.3.26/socket.c fetchmail-6.3.26-nossl3/socket.c ---- fetchmail-6.3.26/socket.c 2013-04-23 22:00:45.000000000 +0200 -+++ fetchmail-6.3.26-nossl3/socket.c 2016-03-03 18:18:46.688881618 +0100 -@@ -907,14 +907,11 @@ - _ssl_context[sock] = NULL; - if(myproto) { - if(!strcasecmp("ssl2",myproto)) { --#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 -- _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); +--- fetchmail-6.4.1/socket.c 2019-09-15 17:48:53.000000000 +0200 ++++ fetchmail-6.4.1/socket.c 2019-09-30 07:13:58.260770910 +0200 +@@ -905,13 +905,8 @@ + } + + if (!strcasecmp("ssl3", *myproto)) { +-#if (HAVE_DECL_SSLV3_CLIENT_METHOD > 0) && (0 == OPENSSL_NO_SSL3 + 0) +- _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); +- *avoid_ssl_versions &= ~SSL_OP_NO_SSLv3; -#else - report(stderr, GT_("Your operating system does not support SSLv2.\n")); - return -1; + report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); + return -1; -#endif - } else if(!strcasecmp("ssl3",myproto)) { -- _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); -+ report(stderr, GT_("Your operating system does not support SSLv3.\n")); -+ return -1; - } else if(!strcasecmp("tls1",myproto)) { - _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); - } else if (!strcasecmp("ssl23",myproto)) { + } else if (!strcasecmp("ssl3+", *myproto)) { + *avoid_ssl_versions &= ~SSL_OP_NO_SSLv3; + *myproto = NULL; |