PGPainless/sop-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/sop-java.git synced 2024-11-26 17:12:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove label() option from armor() operation

Browse source
This commit is contained in:
Paul Schaub 2024-03-30 19:00:09 +01:00
parent a13f1e2a0d
commit 9356447226
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
5 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
external-sop/src/main/kotlin/sop/external/operation/ArmorExternal.kt vendored
View file

@ -7,7 +7,6 @@ package sop.external.operation
import java.io.InputStream import java.io.InputStream
import java.util.Properties import java.util.Properties
import sop.Ready import sop.Ready
import sop.enums.ArmorLabel
import sop.exception.SOPGPException import sop.exception.SOPGPException
import sop.external.ExternalSOP import sop.external.ExternalSOP
import sop.operation.Armor import sop.operation.Armor
@ -18,8 +17,6 @@ class ArmorExternal(binary: String, environment: Properties) : Armor {
private val commandList: MutableList<String> = mutableListOf(binary, "armor") private val commandList: MutableList<String> = mutableListOf(binary, "armor")
private val envList: List<String> = ExternalSOP.propertiesToEnv(environment) private val envList: List<String> = ExternalSOP.propertiesToEnv(environment)
override fun label(label: ArmorLabel): Armor = apply { commandList.add("--label=$label") }
@Throws(SOPGPException.BadData::class) @Throws(SOPGPException.BadData::class)
override fun data(data: InputStream): Ready = override fun data(data: InputStream): Ready =
ExternalSOP.executeTransformingOperation(Runtime.getRuntime(), commandList, envList, data) ExternalSOP.executeTransformingOperation(Runtime.getRuntime(), commandList, envList, data)

1
sop-java-picocli/src/main/resources/msg_armor.properties
View file

@ -2,7 +2,6 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
usage.header=Add ASCII Armor to standard input usage.header=Add ASCII Armor to standard input
label=Label to be used in the header and tail of the armoring
stacktrace=Print stacktrace stacktrace=Print stacktrace
# Generic TODO: Remove when bumping picocli to 4.7.0 # Generic TODO: Remove when bumping picocli to 4.7.0

1
sop-java-picocli/src/main/resources/msg_armor_de.properties
View file

@ -2,7 +2,6 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
usage.header=Schütze Standard-Eingabe mit ASCII Armor usage.header=Schütze Standard-Eingabe mit ASCII Armor
label=Label für Kopf- und Fußzeile der ASCII Armor
stacktrace=Stacktrace ausgeben stacktrace=Stacktrace ausgeben
# Generic TODO: Remove when bumping picocli to 4.7.0 # Generic TODO: Remove when bumping picocli to 4.7.0

14
sop-java/src/main/kotlin/sop/enums/ArmorLabel.kt
View file

@ -1,14 +0,0 @@
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
//
// SPDX-License-Identifier: Apache-2.0
package sop.enums
@Deprecated("Use of armor labels is deprecated.")
enum class ArmorLabel {
auto,
sig,
key,
cert,
message
}

12
sop-java/src/main/kotlin/sop/operation/Armor.kt
View file

@ -7,22 +7,10 @@ package sop.operation
import java.io.IOException import java.io.IOException
import java.io.InputStream import java.io.InputStream
import sop.Ready import sop.Ready
import sop.enums.ArmorLabel
import sop.exception.SOPGPException.BadData import sop.exception.SOPGPException.BadData
import sop.exception.SOPGPException.UnsupportedOption
interface Armor { interface Armor {
/**
* Overrides automatic detection of label.
*
* @param label armor label
* @return builder instance
*/
@Deprecated("Use of armor labels is deprecated and will be removed in a future release.")
@Throws(UnsupportedOption::class)
fun label(label: ArmorLabel): Armor
/** /**
* Armor the provided data. * Armor the provided data.
* *