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 ebf542907d6487d759008399b27e67fb1afb4864..e42dfac69b7d6e8366f5709c392728fc005c152e 100644 (file)
--- 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\r
---- openssl-1.0.1h/ssl/ssl_lib.c.v2v3  2014-06-11 16:02:52.000000000 +0200\r
-+++ openssl-1.0.1h/ssl/ssl_lib.c       2014-06-30 14:18:04.290248080 +0200\r
-@@ -1875,6 +1875,9 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m\r
-        */\r
-       ret->options |= SSL_OP_LEGACY_SERVER_CONNECT;\r
- \r
-+      /* Disable SSLv2 and SSLv3 by default (affects the SSLv23_method() only) */\r
-+      ret->options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;\r
-+\r
-       return(ret);\r
- err:\r
-       SSLerr(SSL_F_SSL_CTX_NEW,ERR_R_MALLOC_FAILURE);\r
+--- 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);