Merge branch '2.9dev' into tls_sockets_extra_extensions

Conflicts:
	testssl.sh
This commit is contained in:
David Cooper 2016-11-04 09:15:28 -04:00
commit 875eefd4fc
3 changed files with 436 additions and 145 deletions

4
.gitignore vendored
View File

@ -1,3 +1,7 @@
.DS_Store
tmp.json
*.bak
*.xml
*.iml

View File

@ -28,7 +28,7 @@ foreach my $f ( @$json ) {
if ( $f->{id} eq "expiration" ) {
$found = 1;
like($f->{finding},qr/^Certificate Expiration.*expired\!/,"Finding reads expired."); $tests++;
is($f->{severity}, "NOT ok", "Severity should be NOT ok"); $tests++;
is($f->{severity}, "CRITICAL", "Severity should be CRITICAL"); $tests++;
last;
}
}
@ -56,7 +56,7 @@ foreach my $f ( @$json ) {
if ( $f->{id} eq "chain_of_trust" ) {
$found = 1;
like($f->{finding},qr/^All certificate trust checks failed/,"Finding says certificate cannot be trusted."); $tests++;
is($f->{severity}, "NOT ok", "Severity should be NOT ok"); $tests++;
is($f->{severity}, "CRITICAL", "Severity should be CRITICAL"); $tests++;
last;
}
}
@ -100,7 +100,7 @@ foreach my $f ( @$json ) {
if ( $f->{id} eq "chain_of_trust" ) {
$found = 1;
like($f->{finding},qr/^All certificate trust checks failed.*incomplete/,"Finding says certificate cannot be trusted."); $tests++;
is($f->{severity}, "NOT ok", "Severity should be NOT ok"); $tests++;
is($f->{severity}, "CRITICAL", "Severity should be CRITICAL"); $tests++;
last;
}
}
@ -118,7 +118,7 @@ is($found,1,"We had a finding for this in the JSON output"); $tests++;
# if ( $f->{id} eq "chain_of_trust" ) {
# $found = 1;
# like($f->{finding},qr/^All certificate trust checks failed.*incomplete/,"Finding says certificate cannot be trusted."); $tests++;
# is($f->{severity}, "NOT ok", "Severity should be NOT ok"); $tests++;
# is($f->{severity}, "CRITICAL", "Severity should be CRITICAL"); $tests++;
# last;
# }
#}
@ -132,4 +132,4 @@ sub json($) {
$file = `cat $file`;
unlink $file;
return from_json($file);
}
}

File diff suppressed because it is too large Load Diff