From 6a7eb2f259c4f173f1545b3aac5398844e66eac6 Mon Sep 17 00:00:00 2001
From: Florian Tham <tham@fidion.de>
Date: Fri, 23 Dec 2016 16:47:42 +0100
Subject: [PATCH] testssl aktualisiert

---
 app-admin/testssl/Manifest                    |  2 +-
 app-admin/testssl/files/follow_symlinks.patch | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app-admin/testssl/Manifest b/app-admin/testssl/Manifest
index 90fc94f..2db56da 100644
--- a/app-admin/testssl/Manifest
+++ b/app-admin/testssl/Manifest
@@ -1,2 +1,2 @@
-AUX follow_symlinks.patch 1229 SHA256 4823976d7135fb52e2af802a8f60cc6449e3d106eb20f18c7aaf2bf62db5398b SHA512 745ffc5a5cce374074650a8a01c67fa30cd617b2c38841e61bf30cfaa85878047898cdfd98331d730d9ecaf3084ca614374310c891c21fd0e09e949b4f8aa931 WHIRLPOOL 007c6d870454adfdda0c8f8aa2e88064e440559f3001a4473b344084b81ca4ab222647bc6afa593c51332651b187c6b709a42e6cf1177427df7487afd4e19cd2
+AUX follow_symlinks.patch 1294 SHA256 f7d6ca114a3c18cc2e64272f846e827261f0918ab302cd031c5b4fd3f07f5259 SHA512 7171777e0efe07fbb0219a18f4271157cde6225ccc98d7948a14ec78e62e73cdb10d4bfb5f6c99d9f67fee593254b76b3e23067acf057014620f61840336b854 WHIRLPOOL 19b178abb29b8289a59f1e58e3be6d844bc1da8361497778565dc6b86b4c64e77e98332852acfe0dafd1de09fe2a8924f5dc1e7eaab4fbffe32132ff023ad2fa
 EBUILD testssl-9999.ebuild 873 SHA256 b450eb3faf053a407e77e46129c836757ebe85784baedbdcc2226eb9adf8e2d1 SHA512 9d5e9ae5c0a6b42a7d3d2701f4a4a7fa37366eeb634aac4d953f1ba6982fae9e3d805bf0bd1cb284e2f5e3f979dd6d0bcf7547d0433efcc0bb71baefd86d3e8d WHIRLPOOL 39799ab075020640903290348f9323909a31fe40758f1eb7db49f40d751d7e5f12fe502709a2a3c9ea7c2400cbef3929b5d20ddcb0cf3e8b78bc4361396b94fe
diff --git a/app-admin/testssl/files/follow_symlinks.patch b/app-admin/testssl/files/follow_symlinks.patch
index cc7ef5c..0fb6631 100644
--- a/app-admin/testssl/files/follow_symlinks.patch
+++ b/app-admin/testssl/files/follow_symlinks.patch
@@ -1,20 +1,22 @@
---- testssl.sh	2016-10-21 16:46:56.391902484 +0200
-+++ testssl.sh-new	2016-10-21 16:52:14.785261019 +0200
+diff --git a/testssl.sh b/testssl.sh
+index 04b2cf4..02d246b 100755
+--- a/testssl.sh
++++ b/testssl.sh
 @@ -90,7 +90,7 @@
       SWURL="https://testssl.sh/    "
  
  readonly PROG_NAME=$(basename "$0")
 -readonly RUN_DIR=$(dirname "$0")
 +readonly RUN_DIR=$(dirname "$(readlink -e $0)")
- TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"   # if you run testssl.sh from a different path you can set either TESTSSL_INSTALL_DIR 
+ TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"   # if you run testssl.sh from a different path you can set either TESTSSL_INSTALL_DIR
  CA_BUNDLES_PATH="${CA_BUNDLES_PATH:-""}"           # or CA_BUNDLES_PATH to find the CA BUNDLES. TESTSSL_INSTALL_DIR helps you to find the RFC mapping also
- MAPPING_FILE_RFC=""
-@@ -7191,7 +7191,7 @@
- # (mapping file provides "keycode/ RFC style name", see RFCs, cipher(1), 
+ CIPHERS_BY_STRENGTH_FILE=""
+@@ -9442,7 +9442,7 @@
+ # TESTSSL_INSTALL_DIR can be supplied via environment so that the cipher mapping and CA bundles can be found
  # www.carbonwind.net/TLS_Cipher_Suites_Project/tls_ssl_cipher_suites_simple_table_all.htm
  get_install_dir() {
 -     [[ -z "$TESTSSL_INSTALL_DIR" ]] && TESTSSL_INSTALL_DIR="$(dirname ${BASH_SOURCE[0]})"
 +     [[ -z "$TESTSSL_INSTALL_DIR" ]] && TESTSSL_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 "$TESTSSL_INSTALL_DIR/etc/mapping-rfc.txt" ]] && MAPPING_FILE_RFC="$TESTSSL_INSTALL_DIR/etc/mapping-rfc.txt"
+      [[ -r "$RUN_DIR/etc/cipher-mapping.txt" ]] && CIPHERS_BY_STRENGTH_FILE="$RUN_DIR/etc/cipher-mapping.txt"
+      [[ -r "$TESTSSL_INSTALL_DIR/etc/cipher-mapping.txt" ]] && CIPHERS_BY_STRENGTH_FILE="$TESTSSL_INSTALL_DIR/etc/cipher-mapping.txt"