Merge branch 'master' into nullpointerfix

ic0ns · web-flow · commit 5562aa415b96 · 2019-11-11T17:58:34.000+01:00
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/BouncyCastleProviderChecker.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/BouncyCastleProviderChecker.java
@@ -16,7 +16,7 @@ public class BouncyCastleProviderChecker {
 
     static boolean isLoaded() {
         for (Provider p : Security.getProviders()) {
-            if (p.getClass().equals(BouncyCastleProvider.class)) {
+            if (p.getClass().getName().equals(BouncyCastleProvider.class.getName())) {
                 return true;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class BouncyCastleProviderChecker {`
`16`	`16`
`17`	`17`	`static boolean isLoaded() {`
`18`	`18`	`for (Provider p : Security.getProviders()) {`
`19`		`- if (p.getClass().equals(BouncyCastleProvider.class)) {`
	`19`	`+ if (p.getClass().getName().equals(BouncyCastleProvider.class.getName())) {`
`20`	`20`	`return true;`
`21`	`21`	`}`
`22`	`22`	`}`