Drop OpenSSL 1.0.1 (#908)

Author: alex

.travis.yml

@@ -15,10 +15,7 @@ matrix:
   - language: generic
     os: osx
     osx_image: xcode10.1
-    env: TOXENV=py27 OPENSSL=1.1.1
-  - python: "2.7" # these are just to make travis's UI a bit prettier
     env: TOXENV=py27
-    dist: trusty # For OpenSSL 1.0.1 coverage
   - python: "2.7"
     env: TOXENV=py27
   - python: "3.5"
@@ -108,11 +105,7 @@ install:
   - |
     if [[ "$(uname -s)" == 'Darwin' ]]; then
       brew update
-      if [[ "${OPENSSL}" == "1.1.1" ]]; then
-        brew upgrade [email protected]
-      else
-        brew upgrade openssl
-      fi
+      brew upgrade [email protected]
       curl -O https://bootstrap.pypa.io/get-pip.py
       python get-pip.py --user
       python -m pip install --user virtualenv
@@ -126,15 +119,9 @@ script:
   - |
     if [[ "$(uname -s)" == 'Darwin' ]]; then
       # set our flags to use homebrew openssl
-      if [[ "${OPENSSL}"  == "1.1.1" ]]; then
-        export LDFLAGS="-L/usr/local/opt/[email protected]/lib"
-        export CFLAGS="-I/usr/local/opt/[email protected]/include"
-        export PATH="/usr/local/opt/[email protected]/bin:$PATH"
-      else
-        export LDFLAGS="-L/usr/local/opt/openssl/lib"
-        export CFLAGS="-I/usr/local/opt/openssl/include"
-        export PATH="/usr/local/opt/openssl/bin:$PATH"
-      fi
+      export LDFLAGS="-L/usr/local/opt/[email protected]/lib"
+      export CFLAGS="-I/usr/local/opt/[email protected]/include"
+      export PATH="/usr/local/opt/[email protected]/bin:$PATH"
     fi
     openssl version
     ~/.venv/bin/tox -v

CHANGELOG.rst

@@ -12,6 +12,7 @@ Backward-incompatible changes:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 - Drop support for Python 3.4
+- Drop support for OpenSSL 1.0.1
 
 Deprecations:
 ^^^^^^^^^^^^^

INSTALL.rst

@@ -25,7 +25,6 @@ Supported OpenSSL Versions
 pyOpenSSL supports the same platforms and releases as the upstream cryptography project `does <https://cryptography.io/en/latest/installation/#supported-platforms>`_.
 Currently that means:
 
-- 1.0.1
 - 1.0.2
 - 1.1.0
 - 1.1.1

src/OpenSSL/SSL.py

@@ -727,14 +727,11 @@ def __init__(self, method):
         _openssl_assert(context != _ffi.NULL)
         context = _ffi.gc(context, _lib.SSL_CTX_free)
 
-        # If SSL_CTX_set_ecdh_auto is available then set it so the ECDH curve
-        # will be auto-selected. This function was added in 1.0.2 and made a
-        # noop in 1.1.0+ (where it is set automatically).
-        try:
-            res = _lib.SSL_CTX_set_ecdh_auto(context, 1)
-            _openssl_assert(res == 1)
-        except AttributeError:
-            pass
+        # Set SSL_CTX_set_ecdh_auto so that the ECDH curve will be
+        # auto-selected. This function was added in 1.0.2 and made a noop in
+        # 1.1.0+ (where it is set automatically).
+        res = _lib.SSL_CTX_set_ecdh_auto(context, 1)
+        _openssl_assert(res == 1)
 
         self._context = context
         self._passphrase_helper = None
@@ -2309,8 +2306,7 @@ def set_session(self, session):
             raise TypeError("session must be a Session instance")
 
         result = _lib.SSL_set_session(self._ssl, session._session)
-        if not result:
-            _raise_current_error()
+        _openssl_assert(result == 1)
 
     def _get_finished_message(self, function):
         """