From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 19 Mar 2015 15:04:35 +0000 (+0100)
Subject: openssl: Rebase "disable SSLv2, SSLv3" patch
X-Git-Url: http://git.ipfire.org/?p=people%2Fdweismueller%2Fipfire-2.x.git;a=commitdiff_plain;h=506e4b967127485c89272751b7d870a9bd4c7b47

openssl: Rebase "disable SSLv2, SSLv3" patch
---

diff --git a/src/patches/openssl-disable-sslv2-sslv3.patch b/src/patches/openssl-disable-sslv2-sslv3.patch
index ebf542907..e42dfac69 100644
--- a/src/patches/openssl-disable-sslv2-sslv3.patch
+++ b/src/patches/openssl-disable-sslv2-sslv3.patch
@@ -1,13 +1,12 @@
-diff -up openssl-1.0.1h/ssl/ssl_lib.c.v2v3 openssl-1.0.1h/ssl/ssl_lib.c
---- openssl-1.0.1h/ssl/ssl_lib.c.v2v3	2014-06-11 16:02:52.000000000 +0200
-+++ openssl-1.0.1h/ssl/ssl_lib.c	2014-06-30 14:18:04.290248080 +0200
-@@ -1875,6 +1875,9 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m
- 	 */
- 	ret->options |= SSL_OP_LEGACY_SERVER_CONNECT;
- 
-+	/* Disable SSLv2 and SSLv3 by default (affects the SSLv23_method() only) */
-+	ret->options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-+
- 	return(ret);
- err:
- 	SSLerr(SSL_F_SSL_CTX_NEW,ERR_R_MALLOC_FAILURE);
+--- openssl-1.0.1m/ssl/ssl_lib.c.old	2015-03-19 15:56:40.966287977 +0100
++++ openssl-1.0.1m/ssl/ssl_lib.c	2015-03-19 15:57:07.976160846 +0100
+@@ -1892,6 +1892,9 @@
+      */
+     ret->options |= SSL_OP_LEGACY_SERVER_CONNECT;
+ 
++    /* Disable SSLv2 and SSLv3 by default (affects the SSLv23_method() only) */
++    ret->options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
++
+     return (ret);
+  err:
+     SSLerr(SSL_F_SSL_CTX_NEW, ERR_R_MALLOC_FAILURE);