Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3.6
Changeset: r94421:a29a0980fd16
Date: 2018-04-23 00:34 +0200
http://bitbucket.org/pypy/pypy/changeset/a29a0980fd16/
Log: We don't need SSL_is_init_finished after all
diff --git a/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py
b/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py
--- a/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py
+++ b/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py
@@ -198,8 +198,6 @@
const char *SSL_get_cipher_list(const SSL *, int);
Cryptography_STACK_OF_SSL_CIPHER *SSL_get_ciphers(const SSL *);
-int SSL_is_init_finished(const SSL*);
-
/* context */
void SSL_CTX_free(SSL_CTX *);
long SSL_CTX_set_timeout(SSL_CTX *, long);
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
@@ -705,7 +705,7 @@
raise ValueError("Session refers to a different SSLContext.")
if self.socket_type != SSL_CLIENT:
raise ValueError("Cannot set session for server-side SSLSocket.")
- if lib.SSL_is_init_finished(self.ssl):
+ if self.handshake_done:
raise ValueError("Cannot set session after handshake.")
if not lib.SSL_set_session(self.ssl, value._session):
raise pyssl_error(self, 0)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
