Commit a6ff5620 authored by Steven Fackler's avatar Steven Fackler
Browse files

Revert "Don't build a custom openssl on OSX"

This reverts commit 64543060.

We actually need 1.0.2 for DTLSv1.2 and ALPN
parent 61e61bba
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -9,8 +9,10 @@ os:
env:
  global:
    - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 aes_xts npn alpn"
before_install:
- (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh)
before_script:
- ./openssl/test/test.sh
script:
- (cd openssl && cargo test)
- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && cargo test --features "$FEATURES"))
- (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test)
- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test --features "$FEATURES"))

openssl/test/build.sh

0 → 100755
+10 −0
Original line number Diff line number Diff line
#!/bin/bash
set -e

mkdir /tmp/openssl
cd /tmp/openssl
sudo apt-get install gcc make
curl https://openssl.org/source/openssl-1.0.2-latest.tar.gz | tar --strip-components=1 -xzf -
./config --prefix=/usr/ shared
make
sudo make install