aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Picus <matti.picus@gmail.com>2022-12-23 14:19:20 +0200
committerMatti Picus <matti.picus@gmail.com>2022-12-23 14:19:20 +0200
commit2278df7155ace17a5f9a00ae42537b8ac94021ba (patch)
tree6a6eaa8263417567faba4b6ca02fc26780a9fd64
parentupdate release note (diff)
downloadpypy-2278df7155ace17a5f9a00ae42537b8ac94021ba.tar.gz
pypy-2278df7155ace17a5f9a00ae42537b8ac94021ba.tar.bz2
pypy-2278df7155ace17a5f9a00ae42537b8ac94021ba.zip
revert over-zeleous removal of deprecated TLSv1 functions
-rw-r--r--lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py20
1 files changed, 20 insertions, 0 deletions
diff --git a/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py b/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py
index 5d39c56d72..cdcbee451f 100644
--- a/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py
+++ b/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py
@@ -376,10 +376,30 @@ unsigned long SSL_CTX_add_extra_chain_cert(SSL_CTX *, X509 *);
/* methods */
+/*
+ * TLSv1_1 and TLSv1_2 are recent additions. Only sufficiently new versions of
+ * OpenSSL support them.
+ */
+const SSL_METHOD *TLSv1_1_method(void);
+const SSL_METHOD *TLSv1_1_server_method(void);
+const SSL_METHOD *TLSv1_1_client_method(void);
+
+const SSL_METHOD *TLSv1_2_method(void);
+const SSL_METHOD *TLSv1_2_server_method(void);
+const SSL_METHOD *TLSv1_2_client_method(void);
+
const SSL_METHOD *SSLv3_method(void);
const SSL_METHOD *SSLv3_server_method(void);
const SSL_METHOD *SSLv3_client_method(void);
+const SSL_METHOD *TLSv1_method(void);
+const SSL_METHOD *TLSv1_server_method(void);
+const SSL_METHOD *TLSv1_client_method(void);
+
+const SSL_METHOD *DTLSv1_method(void);
+const SSL_METHOD *DTLSv1_server_method(void);
+const SSL_METHOD *DTLSv1_client_method(void);
+
/* Added in 1.0.2 */
const SSL_METHOD *DTLS_method(void);
const SSL_METHOD *DTLS_server_method(void);