diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-06-18 12:41:47 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-18 11:41:47 -0500 |
| commit | 5864d84a74cd3a2f6052b6ce76b50de90ee0b3ae (patch) | |
| tree | 3043b488e9b0fb0b2f91fd2889fa365e334cca00 /.travis | |
| parent | 1252dec0c85cd3cb9ea70dcb0ac2a4afc976f2ce (diff) | |
| download | cryptography-5864d84a74cd3a2f6052b6ce76b50de90ee0b3ae.tar.gz cryptography-5864d84a74cd3a2f6052b6ce76b50de90ee0b3ae.tar.bz2 cryptography-5864d84a74cd3a2f6052b6ce76b50de90ee0b3ae.zip | |
Removed some code that existed for OpenSSL 0.9.8 (#2983)
Refs #2982
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/install.sh | 10 | ||||
| -rwxr-xr-x | .travis/run.sh | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index b05ff7be..cdfbace6 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -57,14 +57,8 @@ else pyenv install "pypy-$PYPY_VERSION" pyenv global "pypy-$PYPY_VERSION" fi - if [[ "${OPENSSL}" == "0.9.8" ]]; then - # We use 0.9.8l rather than zh because we have some branches for - # handling < 0.9.8m that won't be exercised with a newer OpenSSL. - # (RHEL5 is 0.9.8e with patches, but while that's in jenkins we don't - # get coverage data from it). - OPENSSL_VERSION_NUMBER="0.9.8l" - OPENSSL_DIR="ossl-098l" - elif [[ "${OPENSSL}" == "1.0.0" ]]; then + + if [[ "${OPENSSL}" == "1.0.0" ]]; then OPENSSL_VERSION_NUMBER="1.0.0t" OPENSSL_DIR="ossl-100t" fi diff --git a/.travis/run.sh b/.travis/run.sh index 9619c24a..5c8b53f9 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -26,9 +26,7 @@ else PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" fi - if [[ "${OPENSSL}" == "0.9.8" ]]; then - OPENSSL_DIR="ossl-098l" - elif [[ "${OPENSSL}" == "1.0.0" ]]; then + if [[ "${OPENSSL}" == "1.0.0" ]]; then OPENSSL_DIR="ossl-100t" fi |