[tomcat-native] 01/01: Fixed the patch disabling the deprecated SSL protocols (Closes: #780447)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat-native.

commit 43e3c8714f0d18a0180c2b517cbd1bdeac1616e5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Mar 14 22:21:32 2015 +0100

    Fixed the patch disabling the deprecated SSL protocols (Closes: #780447)
---
 debian/changelog                       |  7 +++++++
 debian/patches/drop_sslv2_support.diff | 30 ------------------------------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 34809dd..7d32723 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat-native (1.1.32~repack-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the patch disabling the deprecated SSL protocols (Closes: #780447)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 14 Mar 2015 22:18:29 +0100
+
 tomcat-native (1.1.32~repack-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/drop_sslv2_support.diff b/debian/patches/drop_sslv2_support.diff
index bc6fbdc..1811327 100644
--- a/debian/patches/drop_sslv2_support.diff
+++ b/debian/patches/drop_sslv2_support.diff
@@ -54,33 +54,3 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=51056
  #ifndef OPENSSL_NO_SSL2
      } else if (protocol == SSL_PROTOCOL_SSLV2) {
          if (mode == SSL_MODE_CLIENT)
-@@ -121,12 +123,14 @@
-         /* requested but not supported */
- #endif
-     } else {
-+#ifndef OPENSSL_NO_SSL2
-         if (mode == SSL_MODE_CLIENT)
-             ctx = SSL_CTX_new(SSLv23_client_method());
-         else if (mode == SSL_MODE_SERVER)
-             ctx = SSL_CTX_new(SSLv23_server_method());
-         else
-             ctx = SSL_CTX_new(SSLv23_method());
-+#endif
-     }
- 
-     if (!ctx) {
-@@ -148,10 +152,14 @@
-     if (c->bio_os != NULL)
-         BIO_set_fp(c->bio_os, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
-     SSL_CTX_set_options(c->ctx, SSL_OP_ALL);
-+#ifndef OPENSSL_NO_SSL2
-     if (!(protocol & SSL_PROTOCOL_SSLV2))
-         SSL_CTX_set_options(c->ctx, SSL_OP_NO_SSLv2);
-+#endif
-+#ifndef OPENSSL_NO_SSL3
-     if (!(protocol & SSL_PROTOCOL_SSLV3))
-         SSL_CTX_set_options(c->ctx, SSL_OP_NO_SSLv3);
-+#endif
-     if (!(protocol & SSL_PROTOCOL_TLSV1))
-         SSL_CTX_set_options(c->ctx, SSL_OP_NO_TLSv1);
- #ifdef SSL_OP_NO_TLSv1_1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat-native.git