diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-12-13 00:42:41 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-12-12 23:42:41 -0600 |
| commit | cd77364230c208d500c84da38c7419e5f573e2f2 (patch) | |
| tree | 28588b38683166e1222cb4ab5eca3f040bd00222 | |
| parent | fad63fe138581247fed032679c65933f2128bb9e (diff) | |
| download | cryptography-cd77364230c208d500c84da38c7419e5f573e2f2.tar.gz cryptography-cd77364230c208d500c84da38c7419e5f573e2f2.tar.bz2 cryptography-cd77364230c208d500c84da38c7419e5f573e2f2.zip | |
no-ssl3, and some hacks (#3313)
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | .travis/install.sh | 4 | ||||
| -rwxr-xr-x | .travis/run.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 381a7400..d4c39b67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: python cache: directories: - $HOME/.cache/pip - - $HOME/ossl/ + - $HOME/ossl-1/ matrix: include: diff --git a/.travis/install.sh b/.travis/install.sh index d3a7358a..f405ab1c 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -63,12 +63,12 @@ else # download, compile, and install if it's not already present via travis # cache if [ -n "${OPENSSL}" ]; then - OPENSSL_DIR="ossl/${OPENSSL}" + OPENSSL_DIR="ossl-1/${OPENSSL}" if [[ ! -f "$HOME/$OPENSSL_DIR/bin/openssl" ]]; then curl -O https://www.openssl.org/source/openssl-$OPENSSL.tar.gz tar zxf openssl-$OPENSSL.tar.gz cd openssl-$OPENSSL - ./config shared no-asm no-ssl2 -fPIC --prefix="$HOME/$OPENSSL_DIR" + ./config shared no-asm no-ssl2 no-ssl3 -fPIC --prefix="$HOME/$OPENSSL_DIR" # modify the shlib version to a unique one to make sure the dynamic # linker doesn't load the system one. This isn't required for 1.1.0 at the # moment since our Travis builders have a diff shlib version, but it doesn't hurt diff --git a/.travis/run.sh b/.travis/run.sh index 34a9cb54..6ce64733 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -27,7 +27,7 @@ else eval "$(pyenv init -)" fi if [ -n "${OPENSSL}" ]; then - OPENSSL_DIR="ossl/${OPENSSL}" + OPENSSL_DIR="ossl-1/${OPENSSL}" export PATH="$HOME/$OPENSSL_DIR/bin:$PATH" export CFLAGS="-I$HOME/$OPENSSL_DIR/include" |