Merge branch '2.9dev' of github.com:drwetter/testssl.sh into 2.9dev

This commit is contained in:
Dirk 2017-05-16 09:46:55 +02:00
commit dfda82aa7d
2 changed files with 4 additions and 4 deletions

View File

@ -58,6 +58,7 @@ Update notification here or @ [twitter](https://twitter.com/drwetter).
* Native HTML support instead going through 'aha'
* Testing 359 default ciphers (``testssl.sh -e``) with a mixture of sockets and openssl. Same speed as with openssl only but addtional ciphers such as post-quantum ciphers, new CHAHA20/POLY1305, CamelliaGCM etc.
* LUCKY13 and SWEET32 checks
* Ticketbleed check
* LOGJAM: now checking also for known DH parameters
* Check for CAA RR
* Check for OCSP must staple

View File

@ -6,11 +6,10 @@ use Data::Dumper;
my @spec;
my %ciphers;
# Turn cipher section of page like this https://www.ssllabs.com/ssltest/viewClient.html?name=Android&version=4.0.4
# Turn cipher section of page like this https://www.ssllabs.com/ssltest/viewClient.html?name=Android&version=4.0.4
# into an openssl cipher spec
# Get all ciphers first (sorry only works on 64 bit mac atm)
foreach my $line ( split /\n/, `bin/openssl.Darwin.x86_64 ciphers -V 'ALL:COMPLEMENTOFALL:\@STRENGTH'`) {
foreach my $line ( split /\n/, `../bin/openssl.Linux.x86_64 ciphers -V 'ALL:COMPLEMENTOFALL:\@STRENGTH'`) {
my @fields = split /\s+/, $line;
my $hex = "";
foreach my $byte ( split /,/, $fields[1] ) {
@ -36,7 +35,7 @@ while (<>) {
print "** $_\n";
}
}
}
}
}
print join ":", @spec;
print "\n";