remove attempts to test against openssl 0.9.8 (#484)
* remove attempts to test against openssl 0.9.8
* remove some untested branches
diff --git a/.travis.yml b/.travis.yml
index dce3f8b..77d6bc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,10 +14,7 @@
include:
- language: generic
os: osx
- env: TOXENV=py27 OSX_OPENSSL=homebrew
- - language: generic
- os: osx
- env: TOXENV=py27 OSX_OPENSSL=system
+ env: TOXENV=py27
- python: "2.6" # these are just to make travis's UI a bit prettier
env: TOXENV=py26
- python: "2.7"
@@ -67,11 +64,6 @@
env: TOXENV=py35-urllib3Master
- # Also run at least a little bit against an older version of OpenSSL.
- - python: "2.7"
- env:
- OPENSSL=0.9.8 TOXENV=py27
-
# Meta
- python: "2.7"
env: TOXENV=check-manifest
@@ -120,7 +112,7 @@
script:
- |
- if [[ "$(uname -s)" == 'Darwin' && $OSX_OPENSSL == 'homebrew' ]]; then
+ if [[ "$(uname -s)" == 'Darwin' ]]; then
# set our flags to use homebrew openssl
export ARCHFLAGS="-arch x86_64"
export LDFLAGS="-L/usr/local/opt/openssl/lib"
@@ -133,26 +125,6 @@
PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"
fi
- # This section potentially downloads, compiles and installs openssl 0.9.8zg
- if [[ "${OPENSSL}" == "0.9.8" ]]; then
- # download, compile, and install if it's not already present via travis cache
- if [[ ! -f "$HOME/ossl-098/bin/openssl" ]]; then
- curl -O https://www.openssl.org/source/openssl-0.9.8zg.tar.gz
- tar zxvf openssl-0.9.8zg.tar.gz
- cd openssl-0.9.8zg
- echo "OPENSSL_0.9.8ZG_CUSTOM {
- global:
- *;
- };" > openssl.ld
- ./config -Wl,--version-script=openssl.ld -Wl,-Bsymbolic-functions -fPIC shared --prefix=$HOME/ossl-098 --openssldir=/etc/ssl
- make install
- tree $HOME/ossl-098
- fi
- export PATH="$HOME/ossl-098/bin:$PATH"
- export CFLAGS="-I$HOME/ossl-098/include"
- export LDFLAGS="-L$HOME/ossl-098/lib"
- export LD_LIBRARY_PATH="$HOME/ossl-098/lib"
- fi
openssl version
~/.venv/bin/tox -v
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
index c0fbc1d..4e0f8a4 100644
--- a/src/OpenSSL/SSL.py
+++ b/src/OpenSSL/SSL.py
@@ -59,10 +59,7 @@
OP_NO_TLSv1_1 = getattr(_lib, "SSL_OP_NO_TLSv1_1", 0)
OP_NO_TLSv1_2 = getattr(_lib, "SSL_OP_NO_TLSv1_2", 0)
-try:
- MODE_RELEASE_BUFFERS = _lib.SSL_MODE_RELEASE_BUFFERS
-except AttributeError:
- pass
+MODE_RELEASE_BUFFERS = _lib.SSL_MODE_RELEASE_BUFFERS
OP_SINGLE_DH_USE = _lib.SSL_OP_SINGLE_DH_USE
OP_SINGLE_ECDH_USE = _lib.SSL_OP_SINGLE_ECDH_USE
@@ -90,10 +87,7 @@
OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG = (
_lib.SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG
)
-try:
- OP_NO_COMPRESSION = _lib.SSL_OP_NO_COMPRESSION
-except AttributeError:
- pass
+OP_NO_COMPRESSION = _lib.SSL_OP_NO_COMPRESSION
OP_NO_QUERY_MTU = _lib.SSL_OP_NO_QUERY_MTU
OP_COOKIE_EXCHANGE = _lib.SSL_OP_COOKIE_EXCHANGE