moved nonce generator method to GCMFipsUtil class (avoid dup in Java …

…9 tree).
bcgit · Jan 11, 2025 · 3b0be50 · 3b0be50
1 parent ed1208c
commit 3b0be50
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/GCMFipsUtil.java b/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/GCMFipsUtil.java
@@ -0,0 +1,11 @@
+package org.bouncycastle.tls.crypto.impl.jcajce;
+
+import org.bouncycastle.tls.crypto.impl.AEADNonceGeneratorFactory;
+
+class GCMFipsUtil
+{
+    static AEADNonceGeneratorFactory getDefaultFipsGCMNonceGeneratorFactory()
+    {
+        return null;
+    }
+}
diff --git a/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/GCMUtil.java b/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/GCMUtil.java
@@ -6,7 +6,6 @@
 import java.security.PrivilegedExceptionAction;
 import java.security.spec.AlgorithmParameterSpec;
 
-import org.bouncycastle.tls.crypto.impl.AEADNonceGeneratorFactory;
 import org.bouncycastle.util.Integers;
 
 class GCMUtil
@@ -31,11 +30,6 @@ public AlgorithmParameterSpec run()
         });
     }
 
-    static AEADNonceGeneratorFactory getDefaultFipsGCMNonceGeneratorFactory()
-    {
-        return null;
-    }
-
     static boolean isGCMParameterSpecAvailable()
     {
         return gcmParameterSpec != null;

diff --git a/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/JcaTlsCrypto.java b/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/JcaTlsCrypto.java
@@ -1311,7 +1311,7 @@ private TlsAEADCipher createCipher_SM4_GCM(TlsCryptoParameters cryptoParams)
      */
     public AEADNonceGeneratorFactory getFipsGCMNonceGeneratorFactory()
     {
-        return GCMUtil.getDefaultFipsGCMNonceGeneratorFactory();
+        return GCMFipsUtil.getDefaultFipsGCMNonceGeneratorFactory();
     }
 
     String getDigestName(int cryptoHashAlgorithm)