Merge pull request #135 from cconlon/refreshDebugFlags

JCE: refresh debug flags when WolfCryptProvider is loaded

Author: rlm2002

.github/workflows/windows-vs.yml

@@ -274,7 +274,7 @@ jobs:
           $content = Get-Content $userSettingsPath -Raw
           Write-Output "Original file size: $($content.Length) characters"
 
-          $newDefines = "#define WOLFSSL_KEY_GEN`n#define HAVE_CRL`n#define OPENSSL_ALL`n`n"
+          $newDefines = "#define WOLFSSL_KEY_GEN`n#define HAVE_CRL`n#define OPENSSL_ALL`n#define WOLFSSL_SHA224`n`n"
 
           # Try multiple possible insertion points
           $insertPoints = @(

src/main/java/com/wolfssl/provider/jce/WolfCryptProvider.java

@@ -38,6 +38,11 @@ public final class WolfCryptProvider extends Provider {
      */
     public WolfCryptProvider() {
         super("wolfJCE", 1.8, "wolfCrypt JCE Provider");
+
+        /* Refresh debug flags in case system properties were set after
+         * WolfCryptDebug class was first loaded (e.g., via JAVA_OPTS) */
+        WolfCryptDebug.refreshDebugFlags();
+
         registerServices();
     }
 

src/main/java/com/wolfssl/provider/jce/WolfCryptRandom.java

@@ -52,19 +52,19 @@ public WolfCryptRandom() {
     }
 
     @Override
-    protected byte[] engineGenerateSeed(int numBytes) {
+    protected synchronized byte[] engineGenerateSeed(int numBytes) {
 
         return rng.generateBlock(numBytes);
     }
 
     @Override
-    protected void engineNextBytes(byte[] bytes) {
+    protected synchronized void engineNextBytes(byte[] bytes) {
 
         rng.generateBlock(bytes);
     }
 
     @Override
-    protected void engineSetSeed(byte[] seed) {
+    protected synchronized void engineSetSeed(byte[] seed) {
         /* wolfCrypt reseeds internally automatically */
         log("setSeed() not supported by wolfJCE");
     }
@@ -75,7 +75,7 @@ private void log(String msg) {
 
     @SuppressWarnings("deprecation")
     @Override
-    protected void finalize() throws Throwable {
+    protected synchronized void finalize() throws Throwable {
         try {
 
             if (this.rng != null) {
@@ -98,7 +98,9 @@ protected void finalize() throws Throwable {
      *
      * @throws IOException on error writing to ObjectOutputStream
      */
-    private void writeObject(ObjectOutputStream out) throws IOException {
+    private synchronized void writeObject(ObjectOutputStream out)
+        throws IOException {
+
         if (this.rng != null) {
             this.rng.free();
             this.rng.releaseNativeStruct();
@@ -118,7 +120,7 @@ private void writeObject(ObjectOutputStream out) throws IOException {
      * @throws IOException on error reading from ObjectInputStream
      * @throws ClassNotFoundException if object class not found
      */
-    private void readObject(ObjectInputStream in)
+    private synchronized void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
 
         if (rng == null) {