diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/MergeCertsImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/MergeCertsImpl.kt index 3f8a7731..d0997041 100644 --- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/MergeCertsImpl.kt +++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/MergeCertsImpl.kt @@ -4,6 +4,8 @@ package org.pgpainless.sop +import java.io.InputStream +import java.io.OutputStream import org.bouncycastle.bcpg.KeyIdentifier import org.bouncycastle.bcpg.PacketFormat import org.bouncycastle.openpgp.api.OpenPGPCertificate @@ -11,8 +13,6 @@ import org.pgpainless.PGPainless import org.pgpainless.util.ArmoredOutputStreamFactory import sop.Ready import sop.operation.MergeCerts -import java.io.InputStream -import java.io.OutputStream class MergeCertsImpl(private val api: PGPainless) : MergeCerts { @@ -47,11 +47,12 @@ class MergeCertsImpl(private val api: PGPainless) : MergeCerts { baseCerts[update.keyIdentifier] = api.mergeCertificate(baseCert, update) } - val out = if (armor) { - ArmoredOutputStreamFactory.get(outputStream) - } else { - outputStream - } + val out = + if (armor) { + ArmoredOutputStreamFactory.get(outputStream) + } else { + outputStream + } // emit merged and updated base certs for (merged in baseCerts.values) { @@ -66,9 +67,7 @@ class MergeCertsImpl(private val api: PGPainless) : MergeCerts { } } - override fun noArmor(): MergeCerts = apply { - armor = false - } + override fun noArmor(): MergeCerts = apply { armor = false } // from command line override fun updates(updateCerts: InputStream): MergeCerts = apply { diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt index 6f16fc52..5aa405ad 100644 --- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt +++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt @@ -24,7 +24,8 @@ class VersionImpl(private val api: PGPainless) : Version { override fun getExtendedVersion(): String { val bcVersion = - String.format(Locale.US, "Bouncy Castle %.2f", BouncyCastleProvider().versionStr.toDouble()) + String.format( + Locale.US, "Bouncy Castle %.2f", BouncyCastleProvider().versionStr.toDouble()) val specVersion = String.format("%02d", SOP_VERSION) return """${getName()} ${getVersion()} https://codeberg.org/PGPainless/pgpainless/src/branch/main/pgpainless-sop