fix: adjust to new classes for bouncycastle 2.+

Update as required for 2.+ bouncycastle libraries. [#TPCF-6875] [#TPCF-6876]
cloudfoundry · Aug 20, 2024 · 432e0ea · 432e0ea
1 parent 6e5740e
commit 432e0ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         apacheCommonsIoVersion = '2.16.1'
         apacheHttpClientVersion = '4.5.14'
         asciiDoctorConvertPluginVersion = '4.0.3'
-        bcpkixFipsVersion = '1.0.7'
-        bcFipsVersion = '1.0.2.5'
+        bcpkixFipsVersion = '2.0.7'
+        bcFipsVersion = '2.0.0'
         commonsCodecVersion = '1.17.1' // remove this after deleting (now deprecated) spring-security-oauth2
         flywayVersion = '7.15.0'
         guavaVersion = '33.2.1-jre'

diff --git a/components/credentials/src/main/kotlin/org/cloudfoundry/credhub/utils/PrivateKeyReader.kt b/components/credentials/src/main/kotlin/org/cloudfoundry/credhub/utils/PrivateKeyReader.kt
@@ -1,10 +1,10 @@
 package org.cloudfoundry.credhub.utils
 
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo
-import org.bouncycastle.openssl.PEMException
 import org.bouncycastle.openssl.PEMKeyPair
 import org.bouncycastle.openssl.PEMParser
 import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter
+import org.bouncycastle.util.encoders.DecoderException
 import org.cloudfoundry.credhub.exceptions.MalformedPrivateKeyException
 import java.io.StringReader
 import java.security.KeyFactory
@@ -24,7 +24,7 @@ class PrivateKeyReader private constructor() {
                 pemParser = PEMParser(StringReader(privateKeyPem!!))
                 parsed = pemParser.readObject()
                 pemParser.close()
-            } catch (e: PEMException) {
+            } catch (e: DecoderException) {
                 throw MalformedPrivateKeyException("Keys must be PEM-encoded PKCS#1 or unencrypted PKCS#8 keys.")
             }