removed static everywhere

Author: Sabrina Lee

src/main/java/com/ibm/crypto/plus/provider/MessageDigest.java

@@ -19,7 +19,7 @@ abstract class MessageDigest extends MessageDigestSpi implements Cloneable {
     MessageDigest(OpenJCEPlusProvider provider, String ockDigestAlgo) {
         try {
             this.provider = provider;
-            this.digest = Digest.getInstance(provider.getOCKContext(), ockDigestAlgo);
+            this.digest = Digest.getInstance(provider.getOCKContext(), ockDigestAlgo, provider);
         } catch (Exception e) {
             throw provider.providerException("Failure in MessageDigest", e);
         }

src/main/java/com/ibm/crypto/plus/provider/OpenJCEPlusProvider.java

@@ -34,15 +34,17 @@ public abstract class OpenJCEPlusProvider extends java.security.Provider {
     //    private static boolean verifiedSelfIntegrity = false;
     private static final boolean verifiedSelfIntegrity = true;
 
-    private static final Cleaner[] cleaners;
+    private final Cleaner[] cleaners;
 
-    private static final int DEFAULT_NUM_CLEANERS = 2;
+    private final int DEFAULT_NUM_CLEANERS = 2;
 
-    private static final int CUSTOM_NUM_CLEANERS;
+    private final int CUSTOM_NUM_CLEANERS;
 
-    private static AtomicInteger count = new AtomicInteger(0);
+    private AtomicInteger count = new AtomicInteger(0);
+
+    OpenJCEPlusProvider(String name, String info) {
+        super(name, PROVIDER_VER, info);
 
-    static {
         int tempNumCleaners = DEFAULT_NUM_CLEANERS;
         String newNumCleaners = System.getProperty("numCleaners");
 
@@ -64,9 +66,7 @@ public abstract class OpenJCEPlusProvider extends java.security.Provider {
             }
         }
         CUSTOM_NUM_CLEANERS = tempNumCleaners;
-    }
 
-    static {
         cleaners = new Cleaner[CUSTOM_NUM_CLEANERS];
 
         for (int i = 0; i < CUSTOM_NUM_CLEANERS; i++) {
@@ -75,10 +75,6 @@ public abstract class OpenJCEPlusProvider extends java.security.Provider {
         }
     }
 
-    OpenJCEPlusProvider(String name, String info) {
-        super(name, PROVIDER_VER, info);
-    }
-
     static final boolean verifySelfIntegrity(Object c) {
         if (verifiedSelfIntegrity) {
             return true;
@@ -91,7 +87,7 @@ private static final synchronized boolean doSelfVerification(Object c) {
         return true;
     }
 
-    public static void registerCleanable(Object owner, Runnable cleanAction) {
+    public void registerCleanable(Object owner, Runnable cleanAction) {
         Cleaner cleaner = cleaners[count.getAndIncrement() % CUSTOM_NUM_CLEANERS];
         cleaner.register(owner, cleanAction);
     }

src/main/java/com/ibm/crypto/plus/provider/ock/Digest.java

@@ -179,7 +179,9 @@ void releaseContext() throws OCKException {
 
     private long digestId = 0;
 
-    public static Digest getInstance(OCKContext ockContext, String digestAlgo) throws OCKException {
+    private OpenJCEPlusProvider provider;
+
+    public static Digest getInstance(OCKContext ockContext, String digestAlgo, OpenJCEPlusProvider provider) throws OCKException {
         if (ockContext == null) {
             throw new IllegalArgumentException("context is null");
         }
@@ -188,17 +190,18 @@ public static Digest getInstance(OCKContext ockContext, String digestAlgo) throw
             throw new IllegalArgumentException("digestAlgo is null/empty");
         }
 
-        return new Digest(ockContext, digestAlgo);
+        return new Digest(ockContext, digestAlgo, provider);
     }
 
-    private Digest(OCKContext ockContext, String digestAlgo) throws OCKException {
+    private Digest(OCKContext ockContext, String digestAlgo, OpenJCEPlusProvider provider) throws OCKException {
         //final String methodName = "Digest(String)";
         this.ockContext = ockContext;
         this.digestAlgo = digestAlgo;
+        this.provider = provider;
         getContext();
         //OCKDebug.Msg(debPrefix, methodName,  "digestAlgo :" + digestAlgo);
 
-        OpenJCEPlusProvider.registerCleanable(this, cleanOCKResources(digestId, algIndx,
+        this.provider.registerCleanable(this, cleanOCKResources(digestId, algIndx,
             contextFromQueue, needsReinit, ockContext));
     }
 
@@ -343,6 +346,7 @@ public synchronized Object clone() throws CloneNotSupportedException {
         copy.needsReinit = this.needsReinit;
         copy.ockContext = this.ockContext;
         copy.contextFromQueue = false;
+        copy.provider = this.provider;
 
         // Allocate a new context for the digestId and copy all state information from our
         // original context into the copy. 
@@ -360,12 +364,12 @@ public synchronized Object clone() throws CloneNotSupportedException {
             throw new CloneNotSupportedException(stackTrace);
         }
 
-        OpenJCEPlusProvider.registerCleanable(copy, cleanOCKResources(copy.digestId, copy.algIndx,
+        this.provider.registerCleanable(copy, cleanOCKResources(copy.digestId, copy.algIndx,
             copy.contextFromQueue, copy.needsReinit, copy.ockContext));
         return copy;
     }
 
-    private static Runnable cleanOCKResources(long digestId, int algIndx, boolean contextFromQueue,
+    private Runnable cleanOCKResources(long digestId, int algIndx, boolean contextFromQueue,
             boolean needsReinit, OCKContext ockContext) {
         return () -> {
             try {