From 2b9c6e58edfab3f4012d182d11a7c1c783273014 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 30 Jan 2025 12:08:55 +0100 Subject: [PATCH] Integrate KeyIdentifier with SubkeyIdentifier --- .../kotlin/org/pgpainless/key/SubkeyIdentifier.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/SubkeyIdentifier.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/SubkeyIdentifier.kt index 2aec7976..58c935d9 100644 --- a/pgpainless-core/src/main/kotlin/org/pgpainless/key/SubkeyIdentifier.kt +++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/SubkeyIdentifier.kt @@ -5,6 +5,7 @@ package org.pgpainless.key import openpgp.openPgpKeyId +import org.bouncycastle.bcpg.KeyIdentifier import org.bouncycastle.openpgp.PGPKeyRing import org.bouncycastle.openpgp.PGPPublicKey @@ -38,13 +39,17 @@ class SubkeyIdentifier( subkeyFingerprint: OpenPgpFingerprint ) : this(OpenPgpFingerprint.of(keys), subkeyFingerprint) - val keyId = subkeyFingerprint.keyId + val keyIdentifier = KeyIdentifier(subkeyFingerprint.bytes) + val subkeyIdentifier = keyIdentifier + val primaryKeyIdentifier = KeyIdentifier(primaryKeyFingerprint.bytes) + + @Deprecated("Use of key-ids is discouraged.") val keyId = keyIdentifier.keyId val fingerprint = subkeyFingerprint - val subkeyId = subkeyFingerprint.keyId - val primaryKeyId = primaryKeyFingerprint.keyId + @Deprecated("Use of key-ids is discouraged.") val subkeyId = subkeyIdentifier.keyId + @Deprecated("Use of key-ids is discouraged.") val primaryKeyId = primaryKeyIdentifier.keyId - val isPrimaryKey = primaryKeyId == subkeyId + val isPrimaryKey = primaryKeyIdentifier == subkeyIdentifier fun matches(fingerprint: OpenPgpFingerprint) = primaryKeyFingerprint == fingerprint || subkeyFingerprint == fingerprint