From 8a7fd5cb58ee1689ed7be2a00f9e08a55cf09985 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 17 Jun 2025 11:15:29 +0200
Subject: [PATCH] Move validate-userid to SOPV

---
 external-sop/src/main/kotlin/sop/external/ExternalSOPV.kt | 4 ++++
 sop-java/src/main/kotlin/sop/SOP.kt                       | 3 ---
 sop-java/src/main/kotlin/sop/SOPV.kt                      | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/external-sop/src/main/kotlin/sop/external/ExternalSOPV.kt b/external-sop/src/main/kotlin/sop/external/ExternalSOPV.kt
index f22f947..3341055 100644
--- a/external-sop/src/main/kotlin/sop/external/ExternalSOPV.kt
+++ b/external-sop/src/main/kotlin/sop/external/ExternalSOPV.kt
@@ -10,9 +10,11 @@ import sop.SOPV
 import sop.external.ExternalSOP.TempDirProvider
 import sop.external.operation.DetachedVerifyExternal
 import sop.external.operation.InlineVerifyExternal
+import sop.external.operation.ValidateUserIdExternal
 import sop.external.operation.VersionExternal
 import sop.operation.DetachedVerify
 import sop.operation.InlineVerify
+import sop.operation.ValidateUserId
 import sop.operation.Version
 
 /**
@@ -37,6 +39,8 @@ class ExternalSOPV(
     override fun inlineVerify(): InlineVerify =
         InlineVerifyExternal(binaryName, properties, tempDirProvider)
 
+    override fun validateUserId(): ValidateUserId = ValidateUserIdExternal(binaryName, properties)
+
     companion object {
 
         /**
diff --git a/sop-java/src/main/kotlin/sop/SOP.kt b/sop-java/src/main/kotlin/sop/SOP.kt
index fbd0428..a942c56 100644
--- a/sop-java/src/main/kotlin/sop/SOP.kt
+++ b/sop-java/src/main/kotlin/sop/SOP.kt
@@ -68,7 +68,4 @@ interface SOP : SOPV {
 
     /** Certify OpenPGP Certificate User-IDs. */
     fun certifyUserId(): CertifyUserId?
-
-    /** Validate a UserID in an OpenPGP certificate. */
-    fun validateUserId(): ValidateUserId?
 }
diff --git a/sop-java/src/main/kotlin/sop/SOPV.kt b/sop-java/src/main/kotlin/sop/SOPV.kt
index 58a7f13..27eb6e3 100644
--- a/sop-java/src/main/kotlin/sop/SOPV.kt
+++ b/sop-java/src/main/kotlin/sop/SOPV.kt
@@ -6,6 +6,7 @@ package sop
 
 import sop.operation.DetachedVerify
 import sop.operation.InlineVerify
+import sop.operation.ValidateUserId
 import sop.operation.Version
 
 /** Subset of [SOP] implementing only OpenPGP signature verification. */
@@ -31,4 +32,7 @@ interface SOPV {
      * a message, use [detachedVerify] instead.
      */
     fun inlineVerify(): InlineVerify?
+
+    /** Validate a UserID in an OpenPGP certificate. */
+    fun validateUserId(): ValidateUserId?
 }