github bcgit#510 - eliminated warning happening with Java 12.

dghgit · dghgit · commit bf6c20d370e6 · 2019-05-05T16:47:26.000+10:00
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/drbg/DRBG.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/drbg/DRBG.java
@@ -42,8 +42,6 @@ public class DRBG
             {"org.conscrypt.OpenSSLProvider", "org.conscrypt.OpenSSLRandom"},
         };
 
-    private static final Object[] initialEntropySourceAndSpi = findSource();
-
     // Cascade through providers looking for match.
     private final static Object[] findSource()
     {
@@ -68,7 +66,7 @@ private final static Object[] findSource()
     private static class CoreSecureRandom
         extends SecureRandom
     {
-        CoreSecureRandom()
+        CoreSecureRandom(Object[] initialEntropySourceAndSpi)
         {
             super((SecureRandomSpi)initialEntropySourceAndSpi[1], (Provider)initialEntropySourceAndSpi[0]);
         }
@@ -120,9 +118,9 @@ public SecureRandom run()
 
     private static SecureRandom createCoreSecureRandom()
     {
-        if (initialEntropySourceAndSpi != null)
+        if (Security.getProperty("securerandom.source") == null)
         {
-            return new CoreSecureRandom();
+            return new CoreSecureRandom(findSource());
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@ public class DRBG`
`42`	`42`	`{"org.conscrypt.OpenSSLProvider", "org.conscrypt.OpenSSLRandom"},`
`43`	`43`	`};`
`44`	`44`
`45`		`- private static final Object[] initialEntropySourceAndSpi = findSource();`
`46`		`-`
`47`	`45`	`// Cascade through providers looking for match.`
`48`	`46`	`private final static Object[] findSource()`
`49`	`47`	`{`
`@@ -68,7 +66,7 @@ private final static Object[] findSource()`
`68`	`66`	`private static class CoreSecureRandom`
`69`	`67`	`extends SecureRandom`
`70`	`68`	`{`
`71`		`- CoreSecureRandom()`
	`69`	`+ CoreSecureRandom(Object[] initialEntropySourceAndSpi)`
`72`	`70`	`{`
`73`	`71`	`super((SecureRandomSpi)initialEntropySourceAndSpi[1], (Provider)initialEntropySourceAndSpi[0]);`
`74`	`72`	`}`
`@@ -120,9 +118,9 @@ public SecureRandom run()`
`120`	`118`
`121`	`119`	`private static SecureRandom createCoreSecureRandom()`
`122`	`120`	`{`
`123`		`- if (initialEntropySourceAndSpi != null)`
	`121`	`+ if (Security.getProperty("securerandom.source") == null)`
`124`	`122`	`{`
`125`		`- return new CoreSecureRandom();`
	`123`	`+ return new CoreSecureRandom(findSource());`
`126`	`124`	`}`
`127`	`125`	`else`
`128`	`126`	`{`