Merge pull request #31 from RUB-NDS/masterpublic

Masterpublic

Author: jurajsomorovsky

pom.xml

@@ -38,6 +38,11 @@
             <version>2.10.0</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.10.0</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
@@ -131,6 +136,7 @@
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
+                <version>3.0</version>
                 <configuration>
                     <header>${basedir}/license_header_plain.txt</header>
                     <strictCheck>true</strictCheck>

src/main/java/de/rub/nds/tlsscanner/probe/certificate/CertificateChain.java

@@ -202,8 +202,10 @@ public CertificateChain(Certificate certificate, String uri) {
             generallyTrusted = certPathValidationResult.isValid();
             if (!generallyTrusted) {
                 CertPathValidationException[] causes = certPathValidationResult.getCauses();
-                for (CertPathValidationException exception : causes) {
-                    exception.printStackTrace();
+                if (causes != null) {
+                    for (CertPathValidationException exception : causes) {
+                        exception.printStackTrace();
+                    }
                 }
             }
         } else {

src/main/java/de/rub/nds/tlsscanner/probe/padding/PaddingOracleAttributor.java

@@ -384,7 +384,7 @@ private List<KnownPaddingOracleVulnerability> createCve20196485() {
                 + "not directly allow an attacker to obtain the TLS private key.\n "
                 + "\n "
                 + "More Details: https://support.citrix.com/article/CTX240139";
-        knownVulnList.add(new KnownPaddingOracleVulnerability("CVE-2019-6485", "Citrix CVE-2019-6485", "Citrix Netscalar CVE-2019-6485",
+        knownVulnList.add(new KnownPaddingOracleVulnerability("CVE-2019-6485", "Citrix CVE-2019-6485", "Citrix NetScaler CVE-2019-6485",
                 PaddingOracleStrength.POODLE, true, knownVulnableSuites, knownNotVulnableSuites, description,
                 affectedProducts, responseList, false));
 

src/main/java/de/rub/nds/tlsscanner/trust/TrustAnchorManager.java

@@ -30,6 +30,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
 import javax.security.auth.x500.X500Principal;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -135,7 +136,7 @@ private Set<TrustAnchor> getFullTrustAnchorSet() {
         } catch (IOException | NoSuchAlgorithmException | CertificateException | KeyStoreException | InvalidAlgorithmParameterException ex) {
             LOGGER.error("Could not build TrustAnchorSet", ex);
         }
-        return null;
+        return new HashSet<>();
     }
 
     public Set<TrustAnchor> getTrustAnchorSet() {