Skip to content

Commit b5ebf50

Browse files
authored
fixed null pointer that occurs in crawler
1 parent e1d7456 commit b5ebf50

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/namedcurve/NamedCurveWitness.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ public NamedGroup getEcdsaSigGroupEphemeral() {
6565

6666
public boolean isFoundUsingRsaCipher() {
6767
for (CipherSuite cipherSuite : cipherSuites) {
68-
if (AlgorithmResolver.getCertificateKeyType(cipherSuite) == CertificateKeyType.RSA) {
68+
if (!cipherSuite.isTLS13()
69+
&& AlgorithmResolver.getCertificateKeyType(cipherSuite) == CertificateKeyType.RSA) {
6970
return true;
7071
}
7172
}
@@ -74,7 +75,8 @@ public boolean isFoundUsingRsaCipher() {
7475

7576
public boolean isFoundUsingEcdsaStaticCipher() {
7677
for (CipherSuite cipherSuite : cipherSuites) {
77-
if (AlgorithmResolver.getKeyExchangeAlgorithm(cipherSuite) == KeyExchangeAlgorithm.ECDH_ECDSA) {
78+
if (!cipherSuite.isTLS13()
79+
&& AlgorithmResolver.getKeyExchangeAlgorithm(cipherSuite) == KeyExchangeAlgorithm.ECDH_ECDSA) {
7880
return true;
7981
}
8082
}
@@ -83,7 +85,8 @@ public boolean isFoundUsingEcdsaStaticCipher() {
8385

8486
public boolean isFoundUsingEcdsaEphemeralCipher() {
8587
for (CipherSuite cipherSuite : cipherSuites) {
86-
if (AlgorithmResolver.getKeyExchangeAlgorithm(cipherSuite) == KeyExchangeAlgorithm.ECDHE_ECDSA) {
88+
if (!cipherSuite.isTLS13()
89+
&& AlgorithmResolver.getKeyExchangeAlgorithm(cipherSuite) == KeyExchangeAlgorithm.ECDHE_ECDSA) {
8790
return true;
8891
}
8992
}

0 commit comments

Comments
 (0)