From 71479f02210d98ab63b08fba601dda92780faede Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Thu, 10 Apr 2025 13:51:52 +0200
Subject: [PATCH] Certify-UserId: Throw proper exception on unbound user-id

---
 .../main/kotlin/org/pgpainless/sop/CertifyUserIdImpl.kt   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/CertifyUserIdImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/CertifyUserIdImpl.kt
index 4b07237b..498ed3d7 100644
--- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/CertifyUserIdImpl.kt
+++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/CertifyUserIdImpl.kt
@@ -9,11 +9,10 @@ import java.io.OutputStream
 import org.bouncycastle.bcpg.PacketFormat
 import org.bouncycastle.openpgp.api.OpenPGPKey
 import org.pgpainless.PGPainless
-import org.pgpainless.exception.KeyException.UnboundUserIdException
-import org.pgpainless.key.OpenPgpFingerprint
 import org.pgpainless.util.ArmoredOutputStreamFactory
 import org.pgpainless.util.Passphrase
 import sop.Ready
+import sop.exception.SOPGPException
 import sop.operation.CertifyUserId
 
 class CertifyUserIdImpl(private val api: PGPainless) : CertifyUserId {
@@ -39,10 +38,7 @@ class CertifyUserIdImpl(private val api: PGPainless) : CertifyUserId {
                             // Check for non-bound user-ids
                             userIds
                                 .find { cert.getUserId(it)?.isBound != true }
-                                ?.let {
-                                    throw UnboundUserIdException(
-                                        OpenPgpFingerprint.Companion.of(cert), it, null, null)
-                                }
+                                ?.let { throw SOPGPException.CertUserIdNoMatch(cert.fingerprint) }
                         }
                     }
                     .forEach { cert ->