Compare commits
2 Commits
a13f1e2a0d
...
1d80ff1d8d
Author | SHA1 | Date |
---|---|---|
Paul Schaub | 1d80ff1d8d | |
Paul Schaub | 9356447226 |
|
@ -6,6 +6,9 @@ SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 10.0.1-SNAPSHOT
|
||||||
|
- Remove `label()` option from `Armor` operation
|
||||||
|
|
||||||
## 10.0.0
|
## 10.0.0
|
||||||
- Update implementation to [SOP Specification revision 10](https://www.ietf.org/archive/id/draft-dkg-openpgp-stateless-cli-10.html).
|
- Update implementation to [SOP Specification revision 10](https://www.ietf.org/archive/id/draft-dkg-openpgp-stateless-cli-10.html).
|
||||||
- Throw `BadData` when passing KEYS where CERTS are expected
|
- Throw `BadData` when passing KEYS where CERTS are expected
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
|
||||||
}
|
|
|
@ -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.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue