Move validate-userid to SOPV

This commit is contained in:
Paul Schaub 2025-06-17 11:15:29 +02:00
parent 21766a1f39
commit 8a7fd5cb58
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
3 changed files with 8 additions and 3 deletions

View file

@ -10,9 +10,11 @@ import sop.SOPV
import sop.external.ExternalSOP.TempDirProvider import sop.external.ExternalSOP.TempDirProvider
import sop.external.operation.DetachedVerifyExternal import sop.external.operation.DetachedVerifyExternal
import sop.external.operation.InlineVerifyExternal import sop.external.operation.InlineVerifyExternal
import sop.external.operation.ValidateUserIdExternal
import sop.external.operation.VersionExternal import sop.external.operation.VersionExternal
import sop.operation.DetachedVerify import sop.operation.DetachedVerify
import sop.operation.InlineVerify import sop.operation.InlineVerify
import sop.operation.ValidateUserId
import sop.operation.Version import sop.operation.Version
/** /**
@ -37,6 +39,8 @@ class ExternalSOPV(
override fun inlineVerify(): InlineVerify = override fun inlineVerify(): InlineVerify =
InlineVerifyExternal(binaryName, properties, tempDirProvider) InlineVerifyExternal(binaryName, properties, tempDirProvider)
override fun validateUserId(): ValidateUserId = ValidateUserIdExternal(binaryName, properties)
companion object { companion object {
/** /**

View file

@ -68,7 +68,4 @@ interface SOP : SOPV {
/** Certify OpenPGP Certificate User-IDs. */ /** Certify OpenPGP Certificate User-IDs. */
fun certifyUserId(): CertifyUserId? fun certifyUserId(): CertifyUserId?
/** Validate a UserID in an OpenPGP certificate. */
fun validateUserId(): ValidateUserId?
} }

View file

@ -6,6 +6,7 @@ package sop
import sop.operation.DetachedVerify import sop.operation.DetachedVerify
import sop.operation.InlineVerify import sop.operation.InlineVerify
import sop.operation.ValidateUserId
import sop.operation.Version import sop.operation.Version
/** Subset of [SOP] implementing only OpenPGP signature verification. */ /** Subset of [SOP] implementing only OpenPGP signature verification. */
@ -31,4 +32,7 @@ interface SOPV {
* a message, use [detachedVerify] instead. * a message, use [detachedVerify] instead.
*/ */
fun inlineVerify(): InlineVerify? fun inlineVerify(): InlineVerify?
/** Validate a UserID in an OpenPGP certificate. */
fun validateUserId(): ValidateUserId?
} }