PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-25 22:02:05 +01:00
Code Issues Releases Wiki Activity

Bump dependency sop-java to 11.0.0-SNAPSHOT

Browse source
This commit is contained in:
Paul Schaub 2024-09-19 20:42:16 +02:00
parent b719810575
commit 544ce4f3df
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
4 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt
View file

@ -12,7 +12,6 @@ import org.bouncycastle.util.io.Streams
import org.pgpainless.decryption_verification.OpenPgpInputStream import org.pgpainless.decryption_verification.OpenPgpInputStream
import org.pgpainless.util.ArmoredOutputStreamFactory import org.pgpainless.util.ArmoredOutputStreamFactory
import sop.Ready import sop.Ready
import sop.enums.ArmorLabel
import sop.exception.SOPGPException import sop.exception.SOPGPException
import sop.operation.Armor 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.")
}
} }

42
pgpainless-sop/src/main/kotlin/org/pgpainless/sop/SOPImpl.kt
View file

@ -7,6 +7,7 @@ package org.pgpainless.sop
import sop.SOP import sop.SOP
import sop.SOPV import sop.SOPV
import sop.operation.Armor import sop.operation.Armor
import sop.operation.CertifyUserId
import sop.operation.ChangeKeyPassword import sop.operation.ChangeKeyPassword
import sop.operation.Dearmor import sop.operation.Dearmor
import sop.operation.Decrypt import sop.operation.Decrypt
@ -19,38 +20,49 @@ import sop.operation.InlineDetach
import sop.operation.InlineSign import sop.operation.InlineSign
import sop.operation.InlineVerify import sop.operation.InlineVerify
import sop.operation.ListProfiles import sop.operation.ListProfiles
import sop.operation.MergeCerts
import sop.operation.RevokeKey import sop.operation.RevokeKey
import sop.operation.UpdateKey
import sop.operation.ValidateUserId
import sop.operation.Version import sop.operation.Version
class SOPImpl(private val sopv: SOPV = SOPVImpl()) : SOP { class SOPImpl(private val sopv: SOPV = SOPVImpl()) : SOP {
override fun armor(): Armor = ArmorImpl() override fun armor() = ArmorImpl()
override fun changeKeyPassword(): ChangeKeyPassword = ChangeKeyPasswordImpl() override fun certifyUserId() = null
override fun dearmor(): Dearmor = DearmorImpl() override fun changeKeyPassword() = ChangeKeyPasswordImpl()
override fun decrypt(): Decrypt = DecryptImpl() override fun dearmor() = DearmorImpl()
override fun detachedSign(): DetachedSign = DetachedSignImpl() override fun decrypt() = DecryptImpl()
override fun detachedVerify(): DetachedVerify = sopv.detachedVerify() override fun detachedSign() = DetachedSignImpl()
override fun encrypt(): Encrypt = EncryptImpl() override fun detachedVerify() = sopv.detachedVerify()
override fun extractCert(): ExtractCert = ExtractCertImpl() override fun encrypt() = EncryptImpl()
override fun generateKey(): GenerateKey = GenerateKeyImpl() override fun extractCert() = ExtractCertImpl()
override fun inlineDetach(): InlineDetach = InlineDetachImpl() override fun generateKey() = GenerateKeyImpl()
override fun inlineSign(): InlineSign = InlineSignImpl() override fun inlineDetach() = InlineDetachImpl()
override fun inlineVerify(): InlineVerify = sopv.inlineVerify() override fun inlineSign() = InlineSignImpl()
override fun listProfiles(): ListProfiles = ListProfilesImpl() override fun inlineVerify() = sopv.inlineVerify()
override fun revokeKey(): RevokeKey = RevokeKeyImpl() override fun listProfiles() = ListProfilesImpl()
override fun version(): Version = sopv.version() override fun mergeCerts() = null
override fun revokeKey() = RevokeKeyImpl()
override fun updateKey() = null
override fun validateUserId() = null
override fun version() = sopv.version()
} }

6
pgpainless-sop/src/main/kotlin/org/pgpainless/sop/SOPVImpl.kt
View file

@ -16,9 +16,9 @@ class SOPVImpl : SOPV {
ArmoredOutputStreamFactory.setVersionInfo(null) ArmoredOutputStreamFactory.setVersionInfo(null)
} }
override fun detachedVerify(): DetachedVerify = DetachedVerifyImpl() override fun detachedVerify(): DetachedVerify? = DetachedVerifyImpl()
override fun inlineVerify(): InlineVerify = InlineVerifyImpl() override fun inlineVerify(): InlineVerify? = InlineVerifyImpl()
override fun version(): Version = VersionImpl() override fun version(): Version? = VersionImpl()
} }

2
version.gradle
View file

@ -14,6 +14,6 @@ allprojects {
logbackVersion = '1.2.13' logbackVersion = '1.2.13'
mockitoVersion = '4.5.1' mockitoVersion = '4.5.1'
slf4jVersion = '1.7.36' slf4jVersion = '1.7.36'
sopJavaVersion = '10.0.0' sopJavaVersion = '11.0.0-SNAPSHOT'
} }
} }