Merge pull request testssl#760 from dcooper16/fix_757

Fix testssl#757
wondratsch · Jun 1, 2017 · f3f29cd · f3f29cd
2 parents e4f6446 + 5807b5e
commit f3f29cd
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/testssl.sh b/testssl.sh
@@ -10258,7 +10258,6 @@ run_beast(){
                hexc="${TLS_CIPHER_HEXCODE[i]}"
                if [[ ${#hexc} -eq 9 ]] && [[ "${TLS_CIPHER_RFC_NAME[i]}" =~ CBC ]] && \
                   [[ ! "${TLS_CIPHER_RFC_NAME[i]}" =~ SHA256 ]] && [[ ! "${TLS_CIPHER_RFC_NAME[i]}" =~ SHA384 ]]; then
-                    cbc_cipher_list_hex+=", ${hexc:2:2},${hexc:7:2}"
                     ciph[nr_ciphers]="${TLS_CIPHER_OSSL_NAME[i]}"
                     hexcode[nr_ciphers]="${hexc:2:2},${hexc:7:2}"
                     rfc_ciph[nr_ciphers]="${TLS_CIPHER_RFC_NAME[i]}"
@@ -10278,7 +10277,6 @@ run_beast(){
                     nr_ciphers+=1
                fi
           done
-          cbc_cipher_list_hex="${cbc_cipher_list_hex:2}"
      else
           while read hexc dash ciph[nr_ciphers] sslvers kx[nr_ciphers] auth enc[nr_ciphers] mac export2[nr_ciphers]; do
                if [[ ":${cbc_cipher_list}:" =~ ":${ciph[nr_ciphers]}:" ]]; then
@@ -10336,7 +10334,7 @@ run_beast(){
                     "ssl3") proto_hex="00" ;;
                     "tls1") proto_hex="01" ;;
                esac
-               tls_sockets "$proto_hex" "$cbc_cipher_list_hex"
+               tls_sockets "$proto_hex" "$cbc_ciphers_hex"
                [[ $? -eq 0 ]] || continue
           else
                $OPENSSL s_client -"$proto" -cipher "$cbc_cipher_list" $STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $sni >$TMPFILE 2>>$ERRFILE </dev/null