also test under osx

diff --git a/.travis.yml b/.travis.yml
index db87996eba5da92ec04ed4d3fecc2ccaf926b6f3..b4e42e5e7265ed182b100a0090ed9065f4cd0bfc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
 sudo: false
 language: shell
 
+os:
+  - linux
+  - osx
+
 cache:
   directories:
     - ngrok

diff --git a/test.sh b/test.sh
index 572f5564b593c94bb7d2310371effd0862697f3a..e68f22ee4fb67e3db646fc1d6a7f6f118b277647 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -69,7 +69,14 @@ if [[ ! -e "ngrok/ngrok" ]]; then
   (
     mkdir -p ngrok
     cd ngrok
-    wget https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip -O ngrok.zip
+    if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+      wget -O ngrok.zip https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip
+    elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+      wget -O ngrok.zip https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-darwin-amd64.zip
+    else
+      echo "No ngrok for ${TRAVIS_OS_NAME}"
+      exit 1
+    fi
     unzip ngrok.zip ngrok
     chmod +x ngrok
   )
@@ -235,12 +242,12 @@ echo 'PRIVATE_KEY_ROLLOVER="yes"' >> config
 _TEST "Testing Rolloverkeys..."
 _SUBTEST "First Run: Creating rolloverkey"
 ./dehydrated --cron --domain "${TMP2_URL}" > tmplog 2> errorlog || _FAIL "Script execution failed"
-CERT_ROLL_HASH=$(openssl rsa -in certs/${TMP2_URL}/privkey.roll.pem -outform DER -pubout 2>/dev/null | openssl sha256)
+CERT_ROLL_HASH=$(openssl rsa -in certs/${TMP2_URL}/privkey.roll.pem -outform DER -pubout 2>/dev/null | openssl sha -sha256)
 _CHECK_LOG "Generating private key"
 _CHECK_LOG "Generating private rollover key"
 _SUBTEST "Second Run: Force Renew, Use rolloverkey"
 ./dehydrated --cron --force --domain "${TMP2_URL}" > tmplog 2> errorlog || _FAIL "Script execution failed"
-CERT_NEW_HASH=$(openssl rsa -in certs/${TMP2_URL}/privkey.pem -outform DER -pubout 2>/dev/null | openssl sha256)
+CERT_NEW_HASH=$(openssl rsa -in certs/${TMP2_URL}/privkey.pem -outform DER -pubout 2>/dev/null | openssl sha -sha256)
 _CHECK_LOG "Generating private key"
 _CHECK_LOG "Moving Rolloverkey into position"
 _SUBTEST "Verifying Hash Rolloverkey and private key second run"