testssl: fix chain of trust test

This commit is contained in:
Florian Tham
2016-05-13 12:12:34 +02:00
parent eeea197b8f
commit 637e3e3cd4
2 changed files with 13 additions and 3 deletions

View File

@@ -1,2 +1,2 @@
AUX follow_symlinks.patch 316 SHA256 29a38f8deb284e4563fe27dae6aa4342ace18fd9951095f342beea351fa24d7d SHA512 4e6d6b801c66bebf58cc599fdecd9cea0e292049e09e925fbee3d1b1c32109549526dcc8fb95bb1a33f9babe89c2ee58c9c04f4a0640ffbf3b968ac727030711 WHIRLPOOL 5416148539fbd84a7a998fd807c1d255fb5deb1927c244a7dfee8b7bb204d9191e969368c404b26d83a0c3c932c6929254d04089665cc035018a7fb0392b8d4e
AUX follow_symlinks.patch 964 SHA256 ef8409eb65bd6ff16acad2029240d029c404ebad91b346d418f6683d86adf0b8 SHA512 17919469fa477512118720f179bed91b008735c61677d672d0231aeae31ec8bf55ca671139c467f0aec21c0bf5c1f80ab607aea6afed1c9a0a64b6d0c68876e3 WHIRLPOOL 26d1501316bb86f9a5a49ccb1407898c504944834711b8c8f59abd085ef9939ba98d409ed6e7001f5b2745f876f71dae8008f7411c3fffb676c81262220f90af
EBUILD testssl-9999.ebuild 873 SHA256 b450eb3faf053a407e77e46129c836757ebe85784baedbdcc2226eb9adf8e2d1 SHA512 9d5e9ae5c0a6b42a7d3d2701f4a4a7fa37366eeb634aac4d953f1ba6982fae9e3d805bf0bd1cb284e2f5e3f979dd6d0bcf7547d0433efcc0bb71baefd86d3e8d WHIRLPOOL 39799ab075020640903290348f9323909a31fe40758f1eb7db49f40d751d7e5f12fe502709a2a3c9ea7c2400cbef3929b5d20ddcb0cf3e8b78bc4361396b94fe

View File

@@ -1,8 +1,8 @@
diff --git a/testssl.sh b/testssl.sh
index c8ffdcf..018681f 100755
index 04b2cf4..02d246b 100755
--- a/testssl.sh
+++ b/testssl.sh
@@ -79,7 +79,7 @@
@@ -90,7 +90,7 @@ egrep -q "dev|rc" <<< "$VERSION" && \
SWURL="https://testssl.sh/ "
readonly PROG_NAME=$(basename "$0")
@@ -10,3 +10,13 @@ index c8ffdcf..018681f 100755
+readonly RUN_DIR=$(dirname "$(readlink -e $0)")
INSTALL_DIR=""
MAPPING_FILE_RFC=""
OPENSSL_LOCATION=""
@@ -5391,7 +5391,7 @@ old_fart() {
# it provides "keycode/ RFC style name", see RFCs, cipher(1), www.carbonwind.net/TLS_Cipher_Suites_Project/tls_ssl_cipher_suites_simple_table_all.htm
get_install_dir() {
#INSTALL_DIR=$(cd "$(dirname "$0")" && pwd)/$(basename "$0")
- INSTALL_DIR=$(dirname ${BASH_SOURCE[0]})
+ INSTALL_DIR=$(dirname "$(readlink -e ${BASH_SOURCE[0]})")
[[ -r "$RUN_DIR/etc/mapping-rfc.txt" ]] && MAPPING_FILE_RFC="$RUN_DIR/etc/mapping-rfc.txt"
[[ -r "$INSTALL_DIR/etc/mapping-rfc.txt" ]] && MAPPING_FILE_RFC="$INSTALL_DIR/etc/mapping-rfc.txt"