From 5b48eb07bffe53e47b1ca233fb3a6f99f7799f09 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 28 Jan 2025 12:50:01 +0100
Subject: [PATCH] Bump bc to 1.80-SNAPSHOT, sop-java to 10.1.0-SNAPSHOT

---
 .../bouncycastle/extensions/PGPPublicKeyExtensions.kt       | 2 +-
 .../pgpainless/decryption_verification/HardwareSecurity.kt  | 2 +-
 .../src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt         | 6 ------
 version.gradle                                              | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/bouncycastle/extensions/PGPPublicKeyExtensions.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/bouncycastle/extensions/PGPPublicKeyExtensions.kt
index d267fa83..c669a4fa 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/bouncycastle/extensions/PGPPublicKeyExtensions.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/bouncycastle/extensions/PGPPublicKeyExtensions.kt
@@ -4,10 +4,10 @@
 
 package org.pgpainless.bouncycastle.extensions
 
-import org.bouncycastle.asn1.gnu.GNUObjectIdentifiers
 import org.bouncycastle.bcpg.ECDHPublicBCPGKey
 import org.bouncycastle.bcpg.ECDSAPublicBCPGKey
 import org.bouncycastle.bcpg.EdDSAPublicBCPGKey
+import org.bouncycastle.internal.asn1.gnu.GNUObjectIdentifiers
 import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil
 import org.bouncycastle.openpgp.PGPPublicKey
 import org.pgpainless.algorithm.PublicKeyAlgorithm
diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/HardwareSecurity.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/HardwareSecurity.kt
index 1974e290..ca4bf900 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/HardwareSecurity.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/HardwareSecurity.kt
@@ -44,7 +44,7 @@ class HardwareSecurity {
     class HardwareDataDecryptorFactory(
         override val subkeyIdentifier: SubkeyIdentifier,
         private val callback: DecryptionCallback,
-    ) : CustomPublicKeyDataDecryptorFactory {
+    ) : BcPublicKeyDataDecryptorFactory(null), CustomPublicKeyDataDecryptorFactory {
 
         // luckily we can instantiate the BcPublicKeyDataDecryptorFactory with null as argument.
         private val factory: PublicKeyDataDecryptorFactory = BcPublicKeyDataDecryptorFactory(null)
diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt
index bf7e63f1..40ac811d 100644
--- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt
+++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt
@@ -12,7 +12,6 @@ import org.bouncycastle.util.io.Streams
 import org.pgpainless.decryption_verification.OpenPgpInputStream
 import org.pgpainless.util.ArmoredOutputStreamFactory
 import sop.Ready
-import sop.enums.ArmorLabel
 import sop.exception.SOPGPException
 import sop.operation.Armor
 
@@ -46,9 +45,4 @@ class ArmorImpl : Armor {
             }
         }
     }
-
-    @Deprecated("Setting custom labels is not supported.")
-    override fun label(label: ArmorLabel): Armor {
-        throw SOPGPException.UnsupportedOption("Setting custom Armor labels not supported.")
-    }
 }
diff --git a/version.gradle b/version.gradle
index 07c66ec5..5b8db481 100644
--- a/version.gradle
+++ b/version.gradle
@@ -8,12 +8,12 @@ allprojects {
         isSnapshot = true
         pgpainlessMinAndroidSdk = 10
         javaSourceCompatibility = 1.8
-        bouncyCastleVersion = '1.78.1'
+        bouncyCastleVersion = '1.80-SNAPSHOT'
         bouncyPgVersion = bouncyCastleVersion
         junitVersion = '5.8.2'
         logbackVersion = '1.5.13'
         mockitoVersion = '4.5.1'
         slf4jVersion = '1.7.36'
-        sopJavaVersion = '10.0.3'
+        sopJavaVersion = '10.1.0-SNAPSHOT'
     }
 }