Skip to content

Commit

Permalink
Fix some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@rbsec
rbsec committed Mar 24, 2021
1 parent a3a3ada commit cf0437f
Show file tree
Hide file tree
Showing 18 changed files with 94 additions and 203 deletions.
57 changes: 20 additions & 37 deletions docker_test/expected_output/test_1.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 disabled
SSLv3 enabled
TLSv1.0 enabled
TLSv1.1 enabled
TLSv1.1 enabled
TLSv1.2 enabled
TLSv1.3 disabled

Expand Down Expand Up @@ -56,25 +56,25 @@ Accepted TLSv1.2 128 bits CAMELLIA128-SHA
Accepted TLSv1.2 128 bits RC4-SHA 
Accepted TLSv1.2 128 bits RC4-MD5 
Accepted TLSv1.2 112 bits DES-CBC3-SHA 
Preferred TLSv1.1 256 bits ECDHE-RSA-AES256-SHA Curve P-256 DHE 256
Accepted TLSv1.1 256 bits DHE-RSA-AES256-SHA DHE 2048 bits
Accepted TLSv1.1 256 bits DHE-RSA-CAMELLIA256-SHA DHE 2048 bits
Accepted TLSv1.1 128 bits ECDHE-RSA-AES128-SHA Curve P-256 DHE 256
Accepted TLSv1.1 128 bits DHE-RSA-AES128-SHA DHE 2048 bits
Accepted TLSv1.1 128 bits DHE-RSA-SEED-SHA DHE 2048 bits
Accepted TLSv1.1 128 bits DHE-RSA-CAMELLIA128-SHA DHE 2048 bits
Accepted TLSv1.1 128 bits ECDHE-RSA-RC4-SHA  Curve P-256 DHE 256
Accepted TLSv1.1 112 bits ECDHE-RSA-DES-CBC3-SHA  Curve P-256 DHE 256
Accepted TLSv1.1 112 bits DHE-RSA-DES-CBC3-SHA  DHE 2048 bits
Accepted TLSv1.1 256 bits AES256-SHA
Accepted TLSv1.1 256 bits CAMELLIA256-SHA
Accepted TLSv1.1 128 bits AES128-SHA
Accepted TLSv1.1 128 bits SEED-SHA
Accepted TLSv1.1 128 bits CAMELLIA128-SHA
Accepted TLSv1.1 128 bits IDEA-CBC-SHA
Accepted TLSv1.1 128 bits RC4-SHA 
Accepted TLSv1.1 128 bits RC4-MD5 
Accepted TLSv1.1 112 bits DES-CBC3-SHA 
Preferred TLSv1.1 256 bits ECDHE-RSA-AES256-SHA Curve P-256 DHE 256
Accepted TLSv1.1 256 bits DHE-RSA-AES256-SHA DHE 2048 bits
Accepted TLSv1.1 256 bits DHE-RSA-CAMELLIA256-SHA DHE 2048 bits
Accepted TLSv1.1 128 bits ECDHE-RSA-AES128-SHA Curve P-256 DHE 256
Accepted TLSv1.1 128 bits DHE-RSA-AES128-SHA DHE 2048 bits
Accepted TLSv1.1 128 bits DHE-RSA-SEED-SHA DHE 2048 bits
Accepted TLSv1.1 128 bits DHE-RSA-CAMELLIA128-SHA DHE 2048 bits
Accepted TLSv1.1 128 bits ECDHE-RSA-RC4-SHA  Curve P-256 DHE 256
Accepted TLSv1.1 112 bits ECDHE-RSA-DES-CBC3-SHA  Curve P-256 DHE 256
Accepted TLSv1.1 112 bits DHE-RSA-DES-CBC3-SHA  DHE 2048 bits
Accepted TLSv1.1 256 bits AES256-SHA
Accepted TLSv1.1 256 bits CAMELLIA256-SHA
Accepted TLSv1.1 128 bits AES128-SHA
Accepted TLSv1.1 128 bits SEED-SHA
Accepted TLSv1.1 128 bits CAMELLIA128-SHA
Accepted TLSv1.1 128 bits IDEA-CBC-SHA
Accepted TLSv1.1 128 bits RC4-SHA 
Accepted TLSv1.1 128 bits RC4-MD5 
Accepted TLSv1.1 112 bits DES-CBC3-SHA 
Preferred TLSv1.0 256 bits ECDHE-RSA-AES256-SHA Curve P-256 DHE 256
Accepted TLSv1.0 256 bits DHE-RSA-AES256-SHA DHE 2048 bits
Accepted TLSv1.0 256 bits DHE-RSA-CAMELLIA256-SHA DHE 2048 bits
Expand All @@ -98,23 +98,6 @@ Accepted TLSv1.0 112 bits DES-CBC3-SHA
Server Key Exchange Group(s):
TLSv1.2 128 bits secp256r1 (NIST P-256)

Server Signature Algorithm(s):
TLSv1.2 rsa_pkcs1_sha1
TLSv1.2 dsa_sha1
TLSv1.2 ecdsa_sha1
TLSv1.2 rsa_pkcs1_sha224
TLSv1.2 dsa_sha224
TLSv1.2 ecdsa_sha224
TLSv1.2 rsa_pkcs1_sha256
TLSv1.2 dsa_sha256
TLSv1.2 ecdsa_secp256r1_sha256
TLSv1.2 rsa_pkcs1_sha384
TLSv1.2 dsa_sha384
TLSv1.2 ecdsa_secp384r1_sha384
TLSv1.2 rsa_pkcs1_sha512
TLSv1.2 dsa_sha512
TLSv1.2 ecdsa_secp521r1_sha512

SSL Certificate:
Signature Algorithm: sha256WithRSAEncryption
RSA Key Strength: 2048
Expand Down
2 changes: 1 addition & 1 deletion docker_test/expected_output/test_10.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 disabled
SSLv3 disabled
TLSv1.0 disabled
TLSv1.1 disabled
TLSv1.1 disabled
TLSv1.2 enabled
TLSv1.3 disabled

Expand Down
4 changes: 2 additions & 2 deletions docker_test/expected_output/test_11.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Testing SSL server www.amazon.com on port 443 using SNI name 
SSLv2 disabled
SSLv3 disabled
TLSv1.0 enabled
TLSv1.1 enabled
TLSv1.1 enabled
TLSv1.2 enabled
TLSv1.3 enabled
TLSv1.3 disabled

OCSP Stapling Request:
OCSP Response Status: successful (0x0)
Expand Down
5 changes: 1 addition & 4 deletions docker_test/expected_output/test_12.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 enabled
SSLv3 enabled
TLSv1.0 enabled
TLSv1.1 disabled
TLSv1.1 disabled
TLSv1.2 disabled
TLSv1.3 disabled

Expand Down Expand Up @@ -49,9 +49,6 @@ Accepted TLSv1.0 56 bits TLS_DHE_RSA_WITH_DES_CBC_SHA
Server Key Exchange Group(s):
TLSv1.0 128 bits secp256r1 (NIST P-256)

Server Signature Algorithm(s):
TLSv1.0 Server accepts all signature algorithms.

SSL Certificate:
Signature Algorithm: md5WithRSAEncryption
RSA Key Strength: 512
Expand Down
22 changes: 8 additions & 14 deletions docker_test/expected_output/test_13.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 disabled
SSLv3 disabled
TLSv1.0 enabled
TLSv1.1 enabled
TLSv1.1 enabled
TLSv1.2 enabled
TLSv1.3 enabled

Expand Down Expand Up @@ -49,12 +49,12 @@ Accepted TLSv1.2 128 bits AES128-GCM-SHA256
Accepted TLSv1.2 128 bits AES128-CCM
Accepted TLSv1.2 256 bits AES256-SHA
Accepted TLSv1.2 128 bits AES128-SHA
Preferred TLSv1.1 256 bits ECDHE-RSA-AES256-SHA Curve 25519 DHE 253
Accepted TLSv1.1 256 bits DHE-RSA-AES256-SHA DHE 2048 bits
Accepted TLSv1.1 128 bits ECDHE-RSA-AES128-SHA Curve 25519 DHE 253
Accepted TLSv1.1 128 bits DHE-RSA-AES128-SHA DHE 2048 bits
Accepted TLSv1.1 256 bits AES256-SHA
Accepted TLSv1.1 128 bits AES128-SHA
Preferred TLSv1.1 256 bits ECDHE-RSA-AES256-SHA Curve 25519 DHE 253
Accepted TLSv1.1 256 bits DHE-RSA-AES256-SHA DHE 2048 bits
Accepted TLSv1.1 128 bits ECDHE-RSA-AES128-SHA Curve 25519 DHE 253
Accepted TLSv1.1 128 bits DHE-RSA-AES128-SHA DHE 2048 bits
Accepted TLSv1.1 256 bits AES256-SHA
Accepted TLSv1.1 128 bits AES128-SHA
Preferred TLSv1.0 256 bits ECDHE-RSA-AES256-SHA Curve 25519 DHE 253
Accepted TLSv1.0 256 bits DHE-RSA-AES256-SHA DHE 2048 bits
Accepted TLSv1.0 128 bits ECDHE-RSA-AES128-SHA Curve 25519 DHE 253
Expand All @@ -77,15 +77,9 @@ TLSv1.2 192 bits secp384r1 (NIST P-384)
TLSv1.2 260 bits secp521r1 (NIST P-521)
TLSv1.2 128 bits x25519

Server Signature Algorithm(s):
TLSv1.3 rsa_pss_rsae_sha256
TLSv1.3 rsa_pss_rsae_sha384
TLSv1.3 rsa_pss_rsae_sha512
TLSv1.2 Server accepts all signature algorithms.

SSL Certificate:
Signature Algorithm: sha256WithRSAEncryption
RSA Key Strength: 3072
RSA Key Strength: 3072

Subject: lmgtfy.com
Issuer: /C=XX/ST=Nowhere in particular/L=Nowhere
Expand Down
10 changes: 2 additions & 8 deletions docker_test/expected_output/test_14.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 disabled
SSLv3 disabled
TLSv1.0 disabled
TLSv1.1 disabled
TLSv1.1 disabled
TLSv1.2 enabled
TLSv1.3 enabled

Expand Down Expand Up @@ -53,15 +53,9 @@ TLSv1.3 260 bits secp521r1 (NIST P-521)
TLSv1.3 192 bits ffdhe8192
TLSv1.2 260 bits secp521r1 (NIST P-521)

Server Signature Algorithm(s):
TLSv1.3 rsa_pss_rsae_sha256
TLSv1.3 rsa_pss_rsae_sha384
TLSv1.3 rsa_pss_rsae_sha512
TLSv1.2 Server accepts all signature algorithms.

SSL Certificate:
Signature Algorithm: sha256WithRSAEncryption
RSA Key Strength: 3072
RSA Key Strength: 3072

Subject: lmgtfy.com
Issuer: /C=XX/ST=Nowhere in particular/L=Nowhere
Expand Down
13 changes: 3 additions & 10 deletions docker_test/expected_output/test_15.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 disabled
SSLv3 disabled
TLSv1.0 enabled
TLSv1.1 enabled
TLSv1.1 enabled
TLSv1.2 enabled
TLSv1.3 enabled

Expand Down Expand Up @@ -38,8 +38,8 @@ Accepted TLSv1.2 128 bits ECDHE-ECDSA-AES128-GCM-SHA256 Cur
Accepted TLSv1.2 128 bits ECDHE-ECDSA-AES128-CCM Curve 25519 DHE 253
Accepted TLSv1.2 256 bits ECDHE-ECDSA-AES256-SHA Curve 25519 DHE 253
Accepted TLSv1.2 128 bits ECDHE-ECDSA-AES128-SHA Curve 25519 DHE 253
Preferred TLSv1.1 256 bits ECDHE-ECDSA-AES256-SHA Curve 25519 DHE 253
Accepted TLSv1.1 128 bits ECDHE-ECDSA-AES128-SHA Curve 25519 DHE 253
Preferred TLSv1.1 256 bits ECDHE-ECDSA-AES256-SHA Curve 25519 DHE 253
Accepted TLSv1.1 128 bits ECDHE-ECDSA-AES128-SHA Curve 25519 DHE 253
Preferred TLSv1.0 256 bits ECDHE-ECDSA-AES256-SHA Curve 25519 DHE 253
Accepted TLSv1.0 128 bits ECDHE-ECDSA-AES128-SHA Curve 25519 DHE 253

Expand All @@ -58,13 +58,6 @@ TLSv1.2 192 bits secp384r1 (NIST P-384)
TLSv1.2 260 bits secp521r1 (NIST P-521)
TLSv1.2 128 bits x25519

Server Signature Algorithm(s):
TLSv1.3 ecdsa_secp256r1_sha256
TLSv1.2 ecdsa_sha1
TLSv1.2 ecdsa_secp256r1_sha256
TLSv1.2 ecdsa_secp384r1_sha384
TLSv1.2 ecdsa_secp521r1_sha512

SSL Certificate:
Signature Algorithm: sha256WithRSAEncryption
ECC Curve Name: prime256v1
Expand Down
19 changes: 1 addition & 18 deletions docker_test/expected_output/test_16.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 disabled
SSLv3 disabled
TLSv1.0 disabled
TLSv1.1 disabled
TLSv1.1 disabled
TLSv1.2 enabled
TLSv1.3 disabled

Expand Down Expand Up @@ -50,23 +50,6 @@ Accepted TLSv1.2 112 bits DES-CBC3-SHA 
Server Key Exchange Group(s):
TLSv1.2 81 bits sect163k1

Server Signature Algorithm(s):
TLSv1.2 rsa_pkcs1_sha1
TLSv1.2 dsa_sha1
TLSv1.2 ecdsa_sha1
TLSv1.2 rsa_pkcs1_sha224
TLSv1.2 dsa_sha224
TLSv1.2 ecdsa_sha224
TLSv1.2 rsa_pkcs1_sha256
TLSv1.2 dsa_sha256
TLSv1.2 ecdsa_secp256r1_sha256
TLSv1.2 rsa_pkcs1_sha384
TLSv1.2 dsa_sha384
TLSv1.2 ecdsa_secp384r1_sha384
TLSv1.2 rsa_pkcs1_sha512
TLSv1.2 dsa_sha512
TLSv1.2 ecdsa_secp521r1_sha512

SSL Certificate:
Signature Algorithm: sha256WithRSAEncryption
RSA Key Strength: 1024
Expand Down
11 changes: 1 addition & 10 deletions docker_test/expected_output/test_17.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 disabled
SSLv3 disabled
TLSv1.0 disabled
TLSv1.1 disabled
TLSv1.1 disabled
TLSv1.2 enabled
TLSv1.3 disabled

Expand Down Expand Up @@ -41,15 +41,6 @@ Accepted TLSv1.2 128 bits AES128-SHA
Server Key Exchange Group(s):
TLSv1.2 256 bits brainpoolP512r1

Server Signature Algorithm(s):
TLSv1.2 rsa_pkcs1_sha1
TLSv1.2 rsa_pkcs1_sha224
TLSv1.2 rsa_pkcs1_sha256
TLSv1.2 rsa_pkcs1_sha384
TLSv1.2 rsa_pkcs1_sha512
TLSv1.2 rsa_pss_rsae_sha256
TLSv1.2 rsa_pss_rsae_sha384

SSL Certificate:
Signature Algorithm: sha256WithRSAEncryption
RSA Key Strength: 1024
Expand Down
5 changes: 1 addition & 4 deletions docker_test/expected_output/test_18.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 disabled
SSLv3 disabled
TLSv1.0 disabled
TLSv1.1 disabled
TLSv1.1 disabled
TLSv1.2 enabled
TLSv1.3 disabled

Expand All @@ -34,9 +34,6 @@ TLSv1.2 192 bits secp384r1 (NIST P-384)
TLSv1.2 260 bits secp521r1 (NIST P-521)
TLSv1.2 128 bits x25519

Server Signature Algorithm(s):
TLSv1.2 ecdsa_sha1

SSL Certificate:
Signature Algorithm: sha256WithRSAEncryption
ECC Curve Name: prime256v1
Expand Down
2 changes: 1 addition & 1 deletion docker_test/expected_output/test_2.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 enabled
SSLv3 disabled
TLSv1.0 disabled
TLSv1.1 disabled
TLSv1.1 disabled
TLSv1.2 disabled
TLSv1.3 disabled

Expand Down
2 changes: 1 addition & 1 deletion docker_test/expected_output/test_3.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 disabled
SSLv3 enabled
TLSv1.0 disabled
TLSv1.1 disabled
TLSv1.1 disabled
TLSv1.2 disabled
TLSv1.3 disabled

Expand Down
29 changes: 8 additions & 21 deletions docker_test/expected_output/test_4.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Testing SSL server 127.0.0.1 on port 4443 using SNI name 
SSLv2 disabled
SSLv3 disabled
TLSv1.0 enabled
TLSv1.1 enabled
TLSv1.1 enabled
TLSv1.2 enabled
TLSv1.3 enabled

Expand Down Expand Up @@ -50,12 +50,12 @@ Accepted TLSv1.2 256 bits AES256-SHA256
Accepted TLSv1.2 128 bits AES128-SHA256
Accepted TLSv1.2 256 bits AES256-SHA
Accepted TLSv1.2 128 bits AES128-SHA
Preferred TLSv1.1 256 bits ECDHE-RSA-AES256-SHA Curve 25519 DHE 253
Accepted TLSv1.1 256 bits DHE-RSA-AES256-SHA DHE 3072 bits
Accepted TLSv1.1 128 bits ECDHE-RSA-AES128-SHA Curve 25519 DHE 253
Accepted TLSv1.1 128 bits DHE-RSA-AES128-SHA DHE 3072 bits
Accepted TLSv1.1 256 bits AES256-SHA
Accepted TLSv1.1 128 bits AES128-SHA
Preferred TLSv1.1 256 bits ECDHE-RSA-AES256-SHA Curve 25519 DHE 253
Accepted TLSv1.1 256 bits DHE-RSA-AES256-SHA DHE 3072 bits
Accepted TLSv1.1 128 bits ECDHE-RSA-AES128-SHA Curve 25519 DHE 253
Accepted TLSv1.1 128 bits DHE-RSA-AES128-SHA DHE 3072 bits
Accepted TLSv1.1 256 bits AES256-SHA
Accepted TLSv1.1 128 bits AES128-SHA
Preferred TLSv1.0 256 bits ECDHE-RSA-AES256-SHA Curve 25519 DHE 253
Accepted TLSv1.0 256 bits DHE-RSA-AES256-SHA DHE 3072 bits
Accepted TLSv1.0 128 bits ECDHE-RSA-AES128-SHA Curve 25519 DHE 253
Expand All @@ -75,22 +75,9 @@ TLSv1.2 260 bits secp521r1 (NIST P-521)
TLSv1.2 128 bits x25519
TLSv1.2 224 bits x448

Server Signature Algorithm(s):
TLSv1.3 rsa_pss_rsae_sha256
TLSv1.3 rsa_pss_rsae_sha384
TLSv1.3 rsa_pss_rsae_sha512
TLSv1.2 rsa_pkcs1_sha1
TLSv1.2 rsa_pkcs1_sha224
TLSv1.2 rsa_pkcs1_sha256
TLSv1.2 rsa_pkcs1_sha384
TLSv1.2 rsa_pkcs1_sha512
TLSv1.2 rsa_pss_rsae_sha256
TLSv1.2 rsa_pss_rsae_sha384
TLSv1.2 rsa_pss_rsae_sha512

SSL Certificate:
Signature Algorithm: sha256WithRSAEncryption
RSA Key Strength: 3072
RSA Key Strength: 3072

Subject: lmgtfy.com
Issuer: /C=XX/ST=Nowhere in particular/L=Nowhere
Expand Down
Loading

0 comments on commit cf0437f

Please sign in to comment.