[pkg-boost-commits] r14649 - in boost/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2011-05-10 02:42:48 +0000 (Tue, 10 May 2011)
New Revision: 14649

Added:
   boost/trunk/debian/patches/openssl-no-ssl2.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Enable building when OpenSSL has disabled SSLv2.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2011-04-16 07:11:56 UTC (rev 14648)
+++ boost/trunk/debian/changelog	2011-05-10 02:42:48 UTC (rev 14649)
@@ -1,3 +1,11 @@
+boost1.46 (1.46.1-5) unstable; urgency=low
+
+  * patches/openssl-no-ssl2.patch.  New (thanks, Lubo~ Dole~el).  Throw
+    exception if sslv2 context requested but OPENSSL_NO_SSL2 defined.
+    Closes: #621402, #622027, #622070.
+
+ -- Steve M. Robbins <smr at debian.org>  Mon, 09 May 2011 21:34:12 -0500
+
 boost1.46 (1.46.1-4) unstable; urgency=low
 
   * NEWS.Debian: fix format.

Added: boost/trunk/debian/patches/openssl-no-ssl2.patch
===================================================================
--- boost/trunk/debian/patches/openssl-no-ssl2.patch	                        (rev 0)
+++ boost/trunk/debian/patches/openssl-no-ssl2.patch	2011-05-10 02:42:48 UTC (rev 14649)
@@ -0,0 +1,40 @@
+Description: Enable building when OpenSSL has disabled SSLv2
+ Throw exception if SSLv2 connection requested but OPENSSL_NO_SSL2 defined.
+ Fall back to returning invalid state if exceptions are disabled.
+Author: Lubo-B¹ Dole¾el <lubos at dolezel.info>-A
+Bug: 621402, 622027, 622070
+Forwarded: no
+
+--- boost1.46-1.46.1.orig/boost/asio/ssl/detail/openssl_context_service.hpp
++++ boost1.46-1.46.1/boost/asio/ssl/detail/openssl_context_service.hpp
+@@ -19,6 +19,7 @@
+ #include <boost/asio/detail/config.hpp>
+ #include <cstring>
+ #include <string>
++#include <stdexcept>
+ #include <boost/function.hpp>
+ #include <boost/asio/error.hpp>
+ #include <boost/asio/io_service.hpp>
+@@ -66,6 +67,14 @@
+   {
+     switch (m)
+     {
++#if defined(OPENSSL_NO_SSL2)
++    case context_base::sslv2:
++    case context_base::sslv2_client:
++    case context_base::sslv2_server:
++      boost::throw_exception(std::runtime_error("SSLv2 is not supported in your OpenSSL"));
++      impl = ::SSL_CTX_new(0);  // if exceptions are disabled
++      break;
++#else
+     case context_base::sslv2:
+       impl = ::SSL_CTX_new(::SSLv2_method());
+       break;
+@@ -75,6 +84,7 @@
+     case context_base::sslv2_server:
+       impl = ::SSL_CTX_new(::SSLv2_server_method());
+       break;
++#endif
+     case context_base::sslv3:
+       impl = ::SSL_CTX_new(::SSLv3_method());
+       break;

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2011-04-16 07:11:56 UTC (rev 14648)
+++ boost/trunk/debian/patches/series	2011-05-10 02:42:48 UTC (rev 14649)
@@ -1,3 +1,4 @@
+openssl-no-ssl2.patch
 mips-asm.patch
 boost-python-examples.patch
 endian.patch