2
0
mirror of https://github.com/mozilla/cipherscan.git synced 2024-11-05 07:23:42 +01:00

Merge pull request #91 from floatingatoll/fix-1

revert unintended inclusion of sigalg skipping from 9ea1749f
This commit is contained in:
Julien Vehent 2015-09-18 16:50:11 -04:00
commit 460f9cf1f6

View File

@ -363,9 +363,6 @@ check_option_support() {
[[ $OPENSSLBINHELP =~ "$1" ]] [[ $OPENSSLBINHELP =~ "$1" ]]
} }
# We stop processing certificates on each connection once any of them produces a set of valid certificates.
current_sigalg="None"
parse_openssl_output() { parse_openssl_output() {
# clear variables in case matching doesn't hit them # clear variables in case matching doesn't hit them
current_ocspstaple="False" current_ocspstaple="False"
@ -375,6 +372,7 @@ parse_openssl_output() {
current_tickethint="None" current_tickethint="None"
current_pubkey=0 current_pubkey=0
current_trusted="False" current_trusted="False"
current_sigalg="None"
certs_found=0 certs_found=0
current_raw_certificates=() current_raw_certificates=()
@ -439,7 +437,7 @@ parse_openssl_output() {
fi fi
# extract certificates # extract certificates
if [[ $current_sigalg == 'None' && $line =~ -----BEGIN\ CERTIFICATE----- ]]; then if [[ $line =~ -----BEGIN\ CERTIFICATE----- ]]; then
current_raw_certificates[$certs_found]="$line"$'\n' current_raw_certificates[$certs_found]="$line"$'\n'
while read data; do while read data; do
current_raw_certificates[$certs_found]+="$data"$'\n' current_raw_certificates[$certs_found]+="$data"$'\n'