From 38ad124088081d93f5005dc205702fd18f850f08 Mon Sep 17 00:00:00 2001 From: Richard Bonhomme Date: Mon, 10 Jun 2019 17:46:23 +0100 Subject: [PATCH] op_test.sh: remove old style custom ssl lib tests Signed-off-by: Richard Bonhomme --- op_test.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/op_test.sh b/op_test.sh index 13c1740..b78a66e 100755 --- a/op_test.sh +++ b/op_test.sh @@ -57,6 +57,7 @@ init () CUSTOM_VARS="${CUSTOM_VARS:-1}" UNSIGNED_PKI="${UNSIGNED_PKI:-1}" SYS_SSL_ENABLE="${SYS_SSL_ENABLE:-1}" + SYS_SSL_LIBB="openssl" BROKEN_PKI="${BROKEN_PKI:-0}" CUSTOM_OPTS="${CUSTOM_OPTS:-0}" export DEPS_DIR="$ROOT_DIR/testdeps" @@ -581,20 +582,21 @@ create_pki () init - [ -f "$DEPS_DIR/custom-ssl.sh" ] || export CUST_SSL_ENABLE=0 - [ $((CUST_SSL_ENABLE)) -eq 1 ] && "$DEPS_DIR/custom-ssl.sh" + #[ -f "$DEPS_DIR/custom-ssl.sh" ] || export CUST_SSL_ENABLE=0 + #[ $((CUST_SSL_ENABLE)) -eq 1 ] && "$DEPS_DIR/custom-ssl.sh" - [ -f "$DEPS_DIR/openssl.sh" ] || export OPENSSL_ENABLE=0 - [ $((OPENSSL_ENABLE)) -eq 1 ] && "$DEPS_DIR/openssl.sh" + #[ -f "$DEPS_DIR/openssl.sh" ] || export OPENSSL_ENABLE=0 + #[ $((OPENSSL_ENABLE)) -eq 1 ] && "$DEPS_DIR/openssl.sh" - [ -f "$DEPS_DIR/libressl.sh" ] || export LIBRESSL_ENABLE=0 - [ $((LIBRESSL_ENABLE)) -eq 1 ] && "$DEPS_DIR/libressl.sh" + #[ -f "$DEPS_DIR/libressl.sh" ] || export LIBRESSL_ENABLE=0 + #[ $((LIBRESSL_ENABLE)) -eq 1 ] && "$DEPS_DIR/libressl.sh" setup STAGE_NAME="System ssl" if [ $((SYS_SSL_ENABLE)) -eq 1 ] then + export EASYRSA_OPENSSL="$SYS_SSL_LIBB" NEW_PKI="pki-sys-ssl" create_pki else