[pypy-commit] pypy cryptograhpt-2.7: fix typo and deprecate SSLv3

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: cryptograhpt-2.7
Changeset: r97169:7de556aeb5e8
Date: 2019-08-13 11:43 +0300
http://bitbucket.org/pypy/pypy/changeset/7de556aeb5e8/

Log:	fix typo and deprecate SSLv3

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
@@ -767,7 +767,7 @@
         self.ctx = ffi.NULL
         if protocol == PROTOCOL_TLSv1:
             method = lib.TLSv1_method()
-        elif lib.Cryptography_HAS_TLSv1_2 and protocol == PROTOCOL_TLSv1_1:
+        elif lib.Cryptography_HAS_TLSv1_1 and protocol == PROTOCOL_TLSv1_1:
             method = lib.TLSv1_1_method()
         elif lib.Cryptography_HAS_TLSv1_2 and protocol == PROTOCOL_TLSv1_2 :
             method = lib.TLSv1_2_method()
diff --git a/lib_pypy/_ssl_build.py b/lib_pypy/_ssl_build.py
--- a/lib_pypy/_ssl_build.py
+++ b/lib_pypy/_ssl_build.py
@@ -24,6 +24,7 @@
         "cmac",
         "conf",
         "crypto",
+        "ct",
         "dh",
         "dsa",
         "ec",
@@ -32,11 +33,13 @@
         "engine",
         "err",
         "evp",
+        "fips",
         "hmac",
         "nid",
         "objects",
         "ocsp",
         "opensslv",
+        "osrandom_engine",
         "pem",
         "pkcs12",
         "rand",
@@ -50,6 +53,7 @@
         "callbacks",
     ] + pypy_win32_extra,
     libraries=_get_openssl_libraries(sys.platform),
+    extra_compile_args=['-DOPENSSL_NO_SSL3_METHOD'],
     extra_link_args=extra_link_args(compiler_type()),
 )