summaryrefslogtreecommitdiffstats
path: root/tests/features/ssl-ciphers.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/features/ssl-ciphers.t')
-rw-r--r--tests/features/ssl-ciphers.t8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/features/ssl-ciphers.t b/tests/features/ssl-ciphers.t
index f5909f320ac..563d37c5277 100644
--- a/tests/features/ssl-ciphers.t
+++ b/tests/features/ssl-ciphers.t
@@ -4,11 +4,7 @@
. $(dirname $0)/../volume.rc
brick_port() {
- $CLI volume status $1 | awk '
- ($3 == "") { p = $0; next; }
- { $0 = p $0; p = ""; }
- /^Brick/ { print $3; }
- '
+ $CLI --xml volume status $1 | sed -n '/.*<port>\([0-9]*\).*/s//\1/p'
}
wait_mount() {
@@ -37,6 +33,8 @@ wait_mount() {
openssl_connect() {
ssl_opt="-verify 3 -verify_return_error -CAfile $SSL_CA"
ssl_opt="$ssl_opt -crl_check_all -CApath $TMPDIR"
+ #echo openssl s_client $ssl_opt $@ > /dev/tty
+ #read -p "Continue? " nothing
CIPHER=`echo "" |
openssl s_client $ssl_opt $@ 2>/dev/null |
awk '/^ Cipher/{print $3}'`