cadc-util-1.11

make a static method public again (used by cadc-cdp-server)
opencadc · Feb 22, 2024 · c52380b · c52380b
1 parent cf20452
commit c52380b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cadc-util/build.gradle b/cadc-util/build.gradle
@@ -39,7 +39,6 @@ dependencies {
     compile 'org.json:json:20231013'
     compile 'xerces:xercesImpl:[2.12.2,)'
     compile 'org.jdom:jdom2:2.0.6.1'
-    //compile 'org.springframework:spring-jdbc:5.2.22.RELEASE'
     compile 'org.springframework:spring-jdbc:5.2.24.RELEASE'
     compile 'org.apache.commons:commons-dbcp2:[2.8.0,2.9.0)'
 

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/SSLUtil.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/SSLUtil.java
@@ -386,7 +386,8 @@ private static PrivateKey readPrivateKey(File keyFile)
         return readPrivateKey(priv);
     }
 
-    private static PrivateKey readPrivateKey(byte[] bytesPrivateKey)
+    // needed by cadc-cdp-server
+    public static PrivateKey readPrivateKey(byte[] bytesPrivateKey)
             throws InvalidKeySpecException, NoSuchAlgorithmException, IOException {
         KeyFactory kf = KeyFactory.getInstance("RSA");
         PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(bytesPrivateKey);