r68349 - in /trunk/libnet-ssleay-perl/debian: changelog patches/no_sslv2.patch patches/series

[chrisb at users.alioth.debian.org]

Author: chrisb
Date: Thu Feb 10 22:35:34 2011
New Revision: 68349

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=68349
Log:
Added patch no_sslv2; prevents the module trying to use SSLv2 functions if
OpenSSL has been compiled without SSLv2 support (closes: #612780)

Added:
    trunk/libnet-ssleay-perl/debian/patches/no_sslv2.patch
Modified:
    trunk/libnet-ssleay-perl/debian/changelog
    trunk/libnet-ssleay-perl/debian/patches/series

Modified: trunk/libnet-ssleay-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssleay-perl/debian/changelog?rev=68349&op=diff
==============================================================================
--- trunk/libnet-ssleay-perl/debian/changelog (original)
+++ trunk/libnet-ssleay-perl/debian/changelog Thu Feb 10 22:35:34 2011
@@ -1,3 +1,10 @@
+libnet-ssleay-perl (1.36-2) UNRELEASED; urgency=low
+
+  * Added patch no_sslv2; prevents the module trying to use SSLv2 functions if
+    OpenSSL has been compiled without SSLv2 support (closes: #612780)
+
+ -- Chris Butler <chrisb at debian.org>  Thu, 10 Feb 2011 22:10:47 +0000
+
 libnet-ssleay-perl (1.36-1) unstable; urgency=low
 
   [ gregor herrmann ]

Added: trunk/libnet-ssleay-perl/debian/patches/no_sslv2.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssleay-perl/debian/patches/no_sslv2.patch?rev=68349&op=file
==============================================================================
--- trunk/libnet-ssleay-perl/debian/patches/no_sslv2.patch (added)
+++ trunk/libnet-ssleay-perl/debian/patches/no_sslv2.patch Thu Feb 10 22:35:34 2011
@@ -1,0 +1,70 @@
+Description: Make SSLv2 support conditional
+ OpenSSL may be compiled without SSLv2 support, so do not try to use the SSLv2
+ functions if they're not present.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612780
+Forwarded: no
+Author: Chris Butler <chrisb at debian.org>
+Last-Update: 2011-02-10
+
+--- a/lib/Net/SSLeay.pm
++++ b/lib/Net/SSLeay.pm
+@@ -1600,6 +1600,10 @@
+ nonsensical error codes (at the SSL handshake level), try this option
+ before mailing me.
+ 
++Since version 1.0.0, OpenSSL may be compiled without support for SSLv2.
++If this is the case, Net::SSLeay will warn if ssl_version has been set
++to 2.
++
+ The high level API returns the certificate of the peer, thus allowing
+ one to check what certificate was supplied. However, you will only be
+ able to check the certificate after the fact, i.e. you already sent
+@@ -2239,7 +2243,13 @@
+ }
+ 
+ sub new_x_ctx {
+-    if    ($ssl_version == 2)  { $ctx = CTX_v2_new(); }
++    if ($ssl_version == 2)  {
++	unless (exists &Net::SSLeay::CTX_v2_new) {
++	    warn "ssl_version has been set to 2, but this version of OpenSSL has been compiled without SSLv2 support";
++	    return undef;
++	}
++	$ctx = CTX_v2_new();
++    }
+     elsif ($ssl_version == 3)  { $ctx = CTX_v3_new(); }
+     elsif ($ssl_version == 10) { $ctx = CTX_tlsv1_new(); }
+     else                       { $ctx = CTX_new(); }
+--- a/SSLeay.xs
++++ b/SSLeay.xs
+@@ -724,6 +724,8 @@
+      OUTPUT:
+      RETVAL
+ 
++#ifndef OPENSSL_NO_SSL2
++
+ SSL_CTX *
+ SSL_CTX_v2_new()
+      CODE:
+@@ -731,6 +733,8 @@
+      OUTPUT:
+      RETVAL
+ 
++#endif
++
+ SSL_CTX *
+ SSL_CTX_v3_new()
+      CODE:
+@@ -1821,9 +1825,13 @@
+ 
+ #endif
+ 
++#ifndef OPENSSL_NO_SSL2
++
+ SSL_METHOD *
+ SSLv2_method()
+ 
++#endif
++
+ SSL_METHOD *
+ SSLv3_method()
+ 

Modified: trunk/libnet-ssleay-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssleay-perl/debian/patches/series?rev=68349&op=diff
==============================================================================
--- trunk/libnet-ssleay-perl/debian/patches/series (original)
+++ trunk/libnet-ssleay-perl/debian/patches/series Thu Feb 10 22:35:34 2011
@@ -1,2 +1,3 @@
 10fix_pod.patch
 20no-stray-libz-link.patch
+no_sslv2.patch