totpgenerator

commit 5f667992cd6aa02d23b70df1d1a5ba6974ccdb33
parent a11a0e196fe572d15ff7e0c401ee5839d3e10271
Author: Wim Dupont <wim@wimdupont.com>
Date:   Thu, 29 May 2025 20:29:12 +0200

version bump

Diffstat:
M
pom.xml
 | 
15
++++++++++-----
M
src/main/java/com/wimdupont/service/GpgService.java
 | 
2
+-

2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
@@ -11,11 +11,11 @@
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
-        <commons-codec.version>1.17.0</commons-codec.version>
-        <bcpg-jdk18on.version>1.78.1</bcpg-jdk18on.version>
-        <otp-java.version>2.0.3</otp-java.version>
-        <junit-jupiter-engine.version>5.10.2</junit-jupiter-engine.version>
-        <mockito.version>5.12.0</mockito.version>
+        <commons-codec.version>1.18.0</commons-codec.version>
+        <bcpg-jdk18on.version>1.80</bcpg-jdk18on.version>
+        <otp-java.version>2.1.0</otp-java.version>
+        <junit-jupiter-engine.version>5.12.2</junit-jupiter-engine.version>
+        <mockito.version>5.18.0</mockito.version>
     </properties>
 
     <dependencies>
@@ -30,6 +30,11 @@
             <version>${bcpg-jdk18on.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcutil-jdk18on</artifactId>
+            <version>${bcpg-jdk18on.version}</version>
+        </dependency>
+        <dependency>
             <groupId>com.github.bastiaanjansen</groupId>
             <artifactId>otp-java</artifactId>
             <version>${otp-java.version}</version>
diff --git a/src/main/java/com/wimdupont/service/GpgService.java b/src/main/java/com/wimdupont/service/GpgService.java
@@ -61,7 +61,7 @@ public class GpgService {
     }
 
     private PGPPrivateKey retrievePgpPrivateKey(PGPPublicKeyEncryptedData pgpPublicKeyEncryptedData) throws IOException, PGPException {
-        var pgpPrivateKey = readSecretKey(new FileInputStream(applicationProperties.getSecretFile()), pgpPublicKeyEncryptedData.getKeyID())
+        var pgpPrivateKey = readSecretKey(new FileInputStream(applicationProperties.getSecretFile()), pgpPublicKeyEncryptedData.getKeyIdentifier().getKeyId())
                 .extractPrivateKey(new BcPBESecretKeyDecryptorBuilder(new BcPGPDigestCalculatorProvider())
                         .build(PasswordReader.getPassword()));