Merge branch 'main' of gitlab.cryptoworkshop.com:root/bc-java

dghgit · dghgit · commit b8434f830cc9 · 2025-10-18T01:32:52.000+11:00
diff --git a/tls/src/main/java/org/bouncycastle/jsse/provider/ReflectionUtil.java b/tls/src/main/java/org/bouncycastle/jsse/provider/ReflectionUtil.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.tls;
+package org.bouncycastle.jsse.provider;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -7,9 +7,9 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-public abstract class ReflectionUtil
+class ReflectionUtil
 {
-    public static Method findMethod(Method[] methods, String name)
+    static Method findMethod(Method[] methods, String name)
     {
         if (methods != null)
         {
@@ -24,12 +24,13 @@ public static Method findMethod(Method[] methods, String name)
         return null;
     }
 
-    public static boolean hasMethod(Method[] methods, String name)
+    static boolean hasMethod(Method[] methods, String name)
     {
         return null != findMethod(methods, name);
     }
 
-    public static Class<?> getClass(final String className)
+
+    static Class<?> getClass(final String className)
     {
         if (null == className)
         {
@@ -57,7 +58,7 @@ public Class<?> run()
         });
     }
 
-    public static <T> Constructor<T> getDeclaredConstructor(final String className, final Class<?>... parameterTypes)
+    static <T> Constructor<T> getDeclaredConstructor(final String className, final Class<?>... parameterTypes)
     {
         if (null == className)
         {
@@ -89,7 +90,7 @@ public Constructor<T> run()
         });
     }
 
-    public static Method getMethod(final String className, final String methodName, final Class<?>... parameterTypes)
+    static Method getMethod(final String className, final String methodName, final Class<?>... parameterTypes)
     {
         if (null == className || null == methodName)
         {
@@ -121,7 +122,7 @@ public Method run()
         });
     }
 
-    public static Method[] getMethods(final String className)
+    static Method[] getMethods(final String className)
     {
         if (null == className)
         {
@@ -153,7 +154,7 @@ public Method[] run()
         });
     }
 
-    public static Integer getStaticInt(final String className, final String fieldName)
+    static Integer getStaticInt(final String className, final String fieldName)
     {
         return AccessController.doPrivileged(new PrivilegedAction<Integer>()
         {
@@ -188,18 +189,18 @@ public Integer run()
         });
     }
 
-    public static Integer getStaticIntOrDefault(final String className, final String fieldName, int defaultValue)
+    static Integer getStaticIntOrDefault(final String className, final String fieldName, int defaultValue)
     {
         Integer value = getStaticInt(className, fieldName);
         return null == value ? defaultValue : value.intValue();
     }
 
-    public static Object invokeGetter(final Object obj, final Method method)
+    static Object invokeGetter(final Object obj, final Method method)
     {
         return invokeMethod(obj, method);
     }
 
-    public static Object invokeMethod(final Object obj, final Method method, final Object... args)
+    static Object invokeMethod(final Object obj, final Method method, final Object... args)
     {
         return AccessController.doPrivileged(new PrivilegedAction<Object>()
         {
@@ -221,7 +222,7 @@ public Object run()
         });
     }
 
-    public static void invokeSetter(final Object obj, final Method method, final Object arg)
+    static void invokeSetter(final Object obj, final Method method, final Object arg)
     {
         invokeMethod(obj, method, arg);
     }
diff --git a/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/IDNUtil.java b/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/IDNUtil.java
@@ -2,8 +2,6 @@
 
 import java.lang.reflect.Method;
 
-import org.bouncycastle.tls.ReflectionUtil;
-
 public class IDNUtil
 {
     public static final int ALLOW_UNASSIGNED;
diff --git a/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/KeyStoreUtil.java b/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/KeyStoreUtil.java
@@ -7,8 +7,6 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
 
-import org.bouncycastle.tls.ReflectionUtil;
-
 abstract class KeyStoreUtil
 {
     private static final Method getProtectionAlgorithm;
diff --git a/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/PKIXUtil.java b/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/PKIXUtil.java
@@ -5,8 +5,6 @@
 import java.security.cert.X509Certificate;
 import java.util.Map;
 
-import org.bouncycastle.tls.ReflectionUtil;
-
 abstract class PKIXUtil
 {
     private static final Class<?> pkixRevocationCheckerClass;
diff --git a/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLEngineUtil.java b/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLEngineUtil.java
@@ -9,7 +9,6 @@
 import org.bouncycastle.jsse.BCExtendedSSLSession;
 import org.bouncycastle.jsse.BCSSLEngine;
 import org.bouncycastle.jsse.BCSSLParameters;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class SSLEngineUtil
 {
diff --git a/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLParametersUtil.java b/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLParametersUtil.java
@@ -10,7 +10,6 @@
 import org.bouncycastle.jsse.BCSNIServerName;
 import org.bouncycastle.jsse.BCSSLParameters;
 import org.bouncycastle.jsse.java.security.BCAlgorithmConstraints;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class SSLParametersUtil
 {
diff --git a/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLSessionUtil.java b/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLSessionUtil.java
@@ -6,7 +6,6 @@
 import javax.net.ssl.SSLSession;
 
 import org.bouncycastle.jsse.BCExtendedSSLSession;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class SSLSessionUtil
 {
diff --git a/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLSocketUtil.java b/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLSocketUtil.java
@@ -15,7 +15,6 @@
 import org.bouncycastle.jsse.BCExtendedSSLSession;
 import org.bouncycastle.jsse.BCSSLParameters;
 import org.bouncycastle.jsse.BCSSLSocket;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class SSLSocketUtil
 {
diff --git a/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/X509TrustManagerUtil.java b/tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/X509TrustManagerUtil.java
@@ -8,7 +8,6 @@
 
 import org.bouncycastle.jcajce.util.JcaJceHelper;
 import org.bouncycastle.jsse.BCX509ExtendedTrustManager;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class X509TrustManagerUtil
 {
diff --git a/tls/src/main/jdk1.5/org/bouncycastle/tls/crypto/impl/jcajce/PrivateKeyUtil.java b/tls/src/main/jdk1.5/org/bouncycastle/tls/crypto/impl/jcajce/PrivateKeyUtil.java
@@ -1,28 +1,18 @@
 package org.bouncycastle.tls.crypto.impl.jcajce;
 
-import java.lang.reflect.Method;
 import java.security.PrivateKey;
 
-import org.bouncycastle.tls.ReflectionUtil;
+import javax.security.auth.Destroyable;
 
 abstract class PrivateKeyUtil
 {
-    private static final Method destroy;
-
-    static
-    {
-        Method[] methods = ReflectionUtil.getMethods("java.security.PrivateKey");
-
-        destroy = ReflectionUtil.findMethod(methods, "destroy");
-    }
-
     static void destroy(PrivateKey privateKey)
     {
-        if (destroy != null)
+        if (privateKey instanceof Destroyable)
         {
             try
             {
-                ReflectionUtil.invokeMethod(privateKey, destroy);
+                ((Destroyable)privateKey).destroy();
             }
             catch (Exception e)
             {
diff --git a/tls/src/main/jdk1.9/org/bouncycastle/jsse/provider/SSLParametersUtil.java b/tls/src/main/jdk1.9/org/bouncycastle/jsse/provider/SSLParametersUtil.java
@@ -13,7 +13,6 @@
 import org.bouncycastle.jsse.BCSNIServerName;
 import org.bouncycastle.jsse.BCSSLParameters;
 import org.bouncycastle.jsse.java.security.BCAlgorithmConstraints;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class SSLParametersUtil
 {
diff --git a/tls/src/main/jdk1.9/org/bouncycastle/tls/crypto/impl/jcajce/PrivateKeyUtil.java b/tls/src/main/jdk1.9/org/bouncycastle/tls/crypto/impl/jcajce/PrivateKeyUtil.java
@@ -6,12 +6,15 @@ abstract class PrivateKeyUtil
 {
     void destroy(PrivateKey privateKey)
     {
-        try
-        {
-            privateKey.destroy();
-        }
-        catch (Exception e)
+        if (privateKey != null)
         {
+            try
+            {
+                privateKey.destroy();
+            }
+            catch (Exception e)
+            {
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.bouncycastle.tls;`
	`1`	`+package org.bouncycastle.jsse.provider;`
`2`	`2`
`3`	`3`	`import java.lang.reflect.Constructor;`
`4`	`4`	`import java.lang.reflect.Field;`
`@@ -7,9 +7,9 @@`
`7`	`7`	`import java.security.AccessController;`
`8`	`8`	`import java.security.PrivilegedAction;`
`9`	`9`
`10`		`-public abstract class ReflectionUtil`
	`10`	`+class ReflectionUtil`
`11`	`11`	`{`
`12`		`- public static Method findMethod(Method[] methods, String name)`
	`12`	`+ static Method findMethod(Method[] methods, String name)`
`13`	`13`	`{`
`14`	`14`	`if (methods != null)`
`15`	`15`	`{`
`@@ -24,12 +24,13 @@ public static Method findMethod(Method[] methods, String name)`
`24`	`24`	`return null;`
`25`	`25`	`}`
`26`	`26`
`27`		`- public static boolean hasMethod(Method[] methods, String name)`
	`27`	`+ static boolean hasMethod(Method[] methods, String name)`
`28`	`28`	`{`
`29`	`29`	`return null != findMethod(methods, name);`
`30`	`30`	`}`
`31`	`31`
`32`		`- public static Class<?> getClass(final String className)`
	`32`	`+`
	`33`	`+ static Class<?> getClass(final String className)`
`33`	`34`	`{`
`34`	`35`	`if (null == className)`
`35`	`36`	`{`
`@@ -57,7 +58,7 @@ public Class<?> run()`
`57`	`58`	`});`
`58`	`59`	`}`
`59`	`60`
`60`		`- public static <T> Constructor<T> getDeclaredConstructor(final String className, final Class<?>... parameterTypes)`
	`61`	`+ static <T> Constructor<T> getDeclaredConstructor(final String className, final Class<?>... parameterTypes)`
`61`	`62`	`{`
`62`	`63`	`if (null == className)`
`63`	`64`	`{`
`@@ -89,7 +90,7 @@ public Constructor<T> run()`
`89`	`90`	`});`
`90`	`91`	`}`
`91`	`92`
`92`		`- public static Method getMethod(final String className, final String methodName, final Class<?>... parameterTypes)`
	`93`	`+ static Method getMethod(final String className, final String methodName, final Class<?>... parameterTypes)`
`93`	`94`	`{`
`94`	`95`	`if (null == className \|\| null == methodName)`
`95`	`96`	`{`
`@@ -121,7 +122,7 @@ public Method run()`
`121`	`122`	`});`
`122`	`123`	`}`
`123`	`124`
`124`		`- public static Method[] getMethods(final String className)`
	`125`	`+ static Method[] getMethods(final String className)`
`125`	`126`	`{`
`126`	`127`	`if (null == className)`
`127`	`128`	`{`
`@@ -153,7 +154,7 @@ public Method[] run()`
`153`	`154`	`});`
`154`	`155`	`}`
`155`	`156`
`156`		`- public static Integer getStaticInt(final String className, final String fieldName)`
	`157`	`+ static Integer getStaticInt(final String className, final String fieldName)`
`157`	`158`	`{`
`158`	`159`	`return AccessController.doPrivileged(new PrivilegedAction<Integer>()`
`159`	`160`	`{`
`@@ -188,18 +189,18 @@ public Integer run()`
`188`	`189`	`});`
`189`	`190`	`}`
`190`	`191`
`191`		`- public static Integer getStaticIntOrDefault(final String className, final String fieldName, int defaultValue)`
	`192`	`+ static Integer getStaticIntOrDefault(final String className, final String fieldName, int defaultValue)`
`192`	`193`	`{`
`193`	`194`	`Integer value = getStaticInt(className, fieldName);`
`194`	`195`	`return null == value ? defaultValue : value.intValue();`
`195`	`196`	`}`
`196`	`197`
`197`		`- public static Object invokeGetter(final Object obj, final Method method)`
	`198`	`+ static Object invokeGetter(final Object obj, final Method method)`
`198`	`199`	`{`
`199`	`200`	`return invokeMethod(obj, method);`
`200`	`201`	`}`
`201`	`202`
`202`		`- public static Object invokeMethod(final Object obj, final Method method, final Object... args)`
	`203`	`+ static Object invokeMethod(final Object obj, final Method method, final Object... args)`
`203`	`204`	`{`
`204`	`205`	`return AccessController.doPrivileged(new PrivilegedAction<Object>()`
`205`	`206`	`{`
`@@ -221,7 +222,7 @@ public Object run()`
`221`	`222`	`});`
`222`	`223`	`}`
`223`	`224`
`224`		`- public static void invokeSetter(final Object obj, final Method method, final Object arg)`
	`225`	`+ static void invokeSetter(final Object obj, final Method method, final Object arg)`
`225`	`226`	`{`
`226`	`227`	`invokeMethod(obj, method, arg);`
`227`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`
`3`	`3`	`import java.lang.reflect.Method;`
`4`	`4`
`5`		`-import org.bouncycastle.tls.ReflectionUtil;`
`6`		`-`
`7`	`5`	`public class IDNUtil`
`8`	`6`	`{`
`9`	`7`	`public static final int ALLOW_UNASSIGNED;`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`import java.security.NoSuchAlgorithmException;`
`8`	`8`	`import java.security.UnrecoverableKeyException;`
`9`	`9`
`10`		`-import org.bouncycastle.tls.ReflectionUtil;`
`11`		`-`
`12`	`10`	`abstract class KeyStoreUtil`
`13`	`11`	`{`
`14`	`12`	`private static final Method getProtectionAlgorithm;`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`import java.security.cert.X509Certificate;`
`6`	`6`	`import java.util.Map;`
`7`	`7`
`8`		`-import org.bouncycastle.tls.ReflectionUtil;`
`9`		`-`
`10`	`8`	`abstract class PKIXUtil`
`11`	`9`	`{`
`12`	`10`	`private static final Class<?> pkixRevocationCheckerClass;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`import org.bouncycastle.jsse.BCExtendedSSLSession;`
`10`	`10`	`import org.bouncycastle.jsse.BCSSLEngine;`
`11`	`11`	`import org.bouncycastle.jsse.BCSSLParameters;`
`12`		`-import org.bouncycastle.tls.ReflectionUtil;`
`13`	`12`
`14`	`13`	`abstract class SSLEngineUtil`
`15`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`import org.bouncycastle.jsse.BCSNIServerName;`
`11`	`11`	`import org.bouncycastle.jsse.BCSSLParameters;`
`12`	`12`	`import org.bouncycastle.jsse.java.security.BCAlgorithmConstraints;`
`13`		`-import org.bouncycastle.tls.ReflectionUtil;`
`14`	`13`
`15`	`14`	`abstract class SSLParametersUtil`
`16`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`import javax.net.ssl.SSLSession;`
`7`	`7`
`8`	`8`	`import org.bouncycastle.jsse.BCExtendedSSLSession;`
`9`		`-import org.bouncycastle.tls.ReflectionUtil;`
`10`	`9`
`11`	`10`	`abstract class SSLSessionUtil`
`12`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`import org.bouncycastle.jsse.BCExtendedSSLSession;`
`16`	`16`	`import org.bouncycastle.jsse.BCSSLParameters;`
`17`	`17`	`import org.bouncycastle.jsse.BCSSLSocket;`
`18`		`-import org.bouncycastle.tls.ReflectionUtil;`
`19`	`18`
`20`	`19`	`abstract class SSLSocketUtil`
`21`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`
`9`	`9`	`import org.bouncycastle.jcajce.util.JcaJceHelper;`
`10`	`10`	`import org.bouncycastle.jsse.BCX509ExtendedTrustManager;`
`11`		`-import org.bouncycastle.tls.ReflectionUtil;`
`12`	`11`
`13`	`12`	`abstract class X509TrustManagerUtil`
`14`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,28 +1,18 @@`
`1`	`1`	`package org.bouncycastle.tls.crypto.impl.jcajce;`
`2`	`2`
`3`		`-import java.lang.reflect.Method;`
`4`	`3`	`import java.security.PrivateKey;`
`5`	`4`
`6`		`-import org.bouncycastle.tls.ReflectionUtil;`
	`5`	`+import javax.security.auth.Destroyable;`
`7`	`6`
`8`	`7`	`abstract class PrivateKeyUtil`
`9`	`8`	`{`
`10`		`- private static final Method destroy;`
`11`		`-`
`12`		`- static`
`13`		`- {`
`14`		`- Method[] methods = ReflectionUtil.getMethods("java.security.PrivateKey");`
`15`		`-`
`16`		`- destroy = ReflectionUtil.findMethod(methods, "destroy");`
`17`		`- }`
`18`		`-`
`19`	`9`	`static void destroy(PrivateKey privateKey)`
`20`	`10`	`{`
`21`		`- if (destroy != null)`
	`11`	`+ if (privateKey instanceof Destroyable)`
`22`	`12`	`{`
`23`	`13`	`try`
`24`	`14`	`{`
`25`		`- ReflectionUtil.invokeMethod(privateKey, destroy);`
	`15`	`+ ((Destroyable)privateKey).destroy();`
`26`	`16`	`}`
`27`	`17`	`catch (Exception e)`
`28`	`18`	`{`