Merge lp:~corey.bryant/ubuntu/utopic/python-eventlet/0.13.0-1ubuntu3.2 into lp:ubuntu/utopic-proposed/python-eventlet

[Corey Bryant]

[Brian Murray (brian-murray)]

This was already uploaded.

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-09 13:31:20 +0000
+++ debian/changelog	2015-02-20 15:05:36 +0000
@@ -1,3 +1,10 @@
+python-eventlet (0.13.0-1ubuntu3.2) UNRELEASED; urgency=medium
+
+  * debian/patches/sslwrap.diff: Fall back to old behavior if SSLContext
+    not available (LP: #1423675).
+
+ -- Corey Bryant <[e-mail]>  Fri, 20 Feb 2015 09:42:26 -0500
+
 python-eventlet (0.13.0-1ubuntu3.1) utopic; urgency=medium
 
   * debian/patches/socket-timeout.patch: Cherry-pick patch to provide

=== modified file 'debian/patches/sslwrap.diff'
--- debian/patches/sslwrap.diff	2014-10-08 16:22:45 +0000
+++ debian/patches/sslwrap.diff	2015-02-20 15:05:36 +0000
@@ -1,8 +1,6 @@
-Index: b/eventlet/green/ssl.py
-===================================================================
 --- a/eventlet/green/ssl.py
 +++ b/eventlet/green/ssl.py
-@@ -238,14 +238,14 @@ class GreenSSLSocket(__ssl.SSLSocket):
+@@ -238,17 +238,30 @@
          if self._sslobj:
              raise ValueError("attempt to connect already-connected SSLSocket!")
          self._socket_connect(addr)
@@ -10,18 +8,33 @@
 -            self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
 -                                        self.cert_reqs, self.ssl_version,
 -                                        self.ca_certs, self.ciphers)
--        else:
++        try:
++            ctx = SSLContext(self.ssl_version)
++        except:
++            if has_ciphers:
++                self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
++                                            self.cert_reqs, self.ssl_version,
++                                            self.ca_certs, self.ciphers)
++            else:
++                self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
++                                            self.cert_reqs, self.ssl_version,
++                                            self.ca_certs)
+         else:
 -            self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
 -                                        self.cert_reqs, self.ssl_version,
 -                                        self.ca_certs)
-+        ctx = SSLContext(self.ssl_version)
-+        if self.keyfile or self.certfile:
-+            ctx.load_cert_chain(self.certfile, self.keyfile)
-+        if self.ca_certs:
-+            ctx.load_verify_locations(self.ca_certs)
-+        if has_ciphers and self.ciphers:
-+            ctx.set_ciphers(self.ciphers)
-+        self._sslobj = ctx._wrap_socket(self._sock, server_side=False)
++            if self.keyfile or self.certfile:
++                ctx.load_cert_chain(self.certfile, self.keyfile)
++            if self.ca_certs:
++                ctx.load_verify_locations(self.ca_certs)
++            if has_ciphers and self.ciphers:
++                ctx.set_ciphers(self.ciphers)
++            self._sslobj = ctx._wrap_socket(self._sock, server_side=False)
++
          if self.do_handshake_on_connect:
              self.do_handshake()
  
++
+     def accept(self):
+         """Accepts a new connection from a remote client, and returns
+         a tuple containing that new connection wrapped with a server-side

=== modified file 'eventlet/green/ssl.py'
--- eventlet/green/ssl.py	2014-10-08 16:22:45 +0000
+++ eventlet/green/ssl.py	2015-02-20 15:05:36 +0000
@@ -238,17 +238,30 @@
         if self._sslobj:
             raise ValueError("attempt to connect already-connected SSLSocket!")
         self._socket_connect(addr)
-        ctx = SSLContext(self.ssl_version)
-        if self.keyfile or self.certfile:
-            ctx.load_cert_chain(self.certfile, self.keyfile)
-        if self.ca_certs:
-            ctx.load_verify_locations(self.ca_certs)
-        if has_ciphers and self.ciphers:
-            ctx.set_ciphers(self.ciphers)
-        self._sslobj = ctx._wrap_socket(self._sock, server_side=False)
+        try:
+            ctx = SSLContext(self.ssl_version)
+        except:
+            if has_ciphers:
+                self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
+                                            self.cert_reqs, self.ssl_version,
+                                            self.ca_certs, self.ciphers)
+            else:
+                self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
+                                            self.cert_reqs, self.ssl_version,
+                                            self.ca_certs)
+        else:
+            if self.keyfile or self.certfile:
+                ctx.load_cert_chain(self.certfile, self.keyfile)
+            if self.ca_certs:
+                ctx.load_verify_locations(self.ca_certs)
+            if has_ciphers and self.ciphers:
+                ctx.set_ciphers(self.ciphers)
+            self._sslobj = ctx._wrap_socket(self._sock, server_side=False)
+
         if self.do_handshake_on_connect:
             self.do_handshake()
 
+
     def accept(self):
         """Accepts a new connection from a remote client, and returns
         a tuple containing that new connection wrapped with a server-side