[pypy-commit] pypy py3.5: Add missing property _SSLSocket.server_side (fixes #2547)

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r91154:9252012ce1b9
Date: 2017-04-30 19:18 +0100
http://bitbucket.org/pypy/pypy/changeset/9252012ce1b9/

Log:	Add missing property _SSLSocket.server_side (fixes #2547)

diff --git a/lib_pypy/_cffi_ssl/_stdssl/__init__.py b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
@@ -46,7 +46,7 @@
 SERVER = 1
 
 VERIFY_DEFAULT = 0
-VERIFY_CRL_CHECK_LEAF = lib.X509_V_FLAG_CRL_CHECK 
+VERIFY_CRL_CHECK_LEAF = lib.X509_V_FLAG_CRL_CHECK
 VERIFY_CRL_CHECK_CHAIN = lib.X509_V_FLAG_CRL_CHECK | lib.X509_V_FLAG_CRL_CHECK_ALL
 VERIFY_X509_STRICT = lib.X509_V_FLAG_X509_STRICT
 if lib.Cryptography_HAS_X509_V_FLAG_TRUSTED_FIRST:
@@ -297,6 +297,10 @@
         else:
             raise TypeError("The value must be a SSLContext")
 
+    @property
+    def server_side(self):
+        return self.socket_type == SSL_SERVER
+
     def do_handshake(self):
         sock = self.get_socket_or_connection_gone()
         ssl = self.ssl
@@ -658,7 +662,7 @@
     def tls_unique_cb(self):
         buf = ffi.new("char[]", SSL_CB_MAXLEN)
 
-        if lib.SSL_session_reused(self.ssl) ^ (not self.socket_type):
+        if lib.SSL_session_reused(self.ssl) ^ (not self.server_side):
             # if session is resumed XOR we are the client
             length = lib.SSL_get_finished(self.ssl, buf, SSL_CB_MAXLEN)
         else:
@@ -1297,7 +1301,7 @@
     result = _asn1obj2py(obj);
     lib.ASN1_OBJECT_free(obj);
     return result;
-                                                               
+
 
 class MemoryBIO(object):
     def __init__(self):