From 1883590c61e912a627e3c02542d9a2d0b4019d24 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Thu, 13 Oct 2016 19:21:12 -0700
Subject: [PATCH] Correct feature selection in tests

---
 openssl/Cargo.toml  |  3 ++-
 openssl/test/run.sh | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index 868aef60..2ed0df12 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -17,9 +17,10 @@ rfc5114 = []
 aes_xts = []
 aes_ctr = []
 alpn = []
+ecdh_auto = []
 openssl-102 = []
 
-ecdh_auto = []
+openssl-110 = ["openssl-102"]
 
 [dependencies]
 bitflags = "0.7"
diff --git a/openssl/test/run.sh b/openssl/test/run.sh
index cecf3c52..cc4756bf 100755
--- a/openssl/test/run.sh
+++ b/openssl/test/run.sh
@@ -1,9 +1,16 @@
 #!/bin/bash
 set -e
 
-if [ "$BUILD_OPENSSL_VERSION" != "" ]; then
-    FEATURES="aes_xts aes_ctr alpn rfc5114 ecdh_auto openssl-102"
-fi
+case "$BUILD_OPENSSL_VERSION" in
+    1.0.2*)
+        FEATURES="openssl-102"
+        ;;
+    1.1.0*)
+        FEATURES="openssl-110"
+        ;;
+esac
+
+echo Using features: $FEATURES
 
 if [ -d "$HOME/openssl/lib" ]; then
     export OPENSSL_DIR=$HOME/openssl