From c52380bda7866cdae8865e232965b39572f2c9a1 Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Thu, 22 Feb 2024 11:11:50 -0800 Subject: [PATCH] cadc-util-1.11 make a static method public again (used by cadc-cdp-server) --- cadc-util/build.gradle | 1 - cadc-util/src/main/java/ca/nrc/cadc/auth/SSLUtil.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cadc-util/build.gradle b/cadc-util/build.gradle index d5c9ed21..32d61655 100644 --- 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 index 0ee44cea..71e53039 100644 --- 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);