Compare commits

..

3 commits

Author SHA1 Message Date
859bb5bdde
Fix issues in kdoc 2025-04-04 12:16:00 +02:00
edb405d79e
Add TODO to remove ProxyOutputStream in 11.X 2025-04-04 12:11:20 +02:00
57e2f8391b
Update CHANGELOG 2025-04-04 10:43:49 +02:00
6 changed files with 11 additions and 5 deletions

View file

@ -6,6 +6,10 @@ SPDX-License-Identifier: Apache-2.0
# Changelog # Changelog
## 10.1.1-SNAPSHOT
- Prepare jar files for use in native images, e.g. using GraalVM by generating and including
configuration files for reflection, resources and dynamic proxies.
## 10.1.0 ## 10.1.0
- `sop-java`: - `sop-java`:
- Remove `label()` option from `armor()` subcommand - Remove `label()` option from `armor()` subcommand

View file

@ -37,7 +37,7 @@ class EncryptExternal(
override fun signWith(key: InputStream): Encrypt = apply { override fun signWith(key: InputStream): Encrypt = apply {
commandList.add("--sign-with=@ENV:SIGN_WITH_$argCounter") commandList.add("--sign-with=@ENV:SIGN_WITH_$argCounter")
envList.add("SIGN_WITH_$argCounter=${ExternalSOP.readString(key)}") envList.add("SIGN_WITH_$argCounter=${readString(key)}")
argCounter += 1 argCounter += 1
} }

View file

@ -60,7 +60,7 @@ class SopCLI {
@JvmField var EXECUTABLE_NAME = "sop" @JvmField var EXECUTABLE_NAME = "sop"
@JvmField @JvmField
@Option(names = ["--stacktrace"], scope = CommandLine.ScopeType.INHERIT) @Option(names = ["--stacktrace"], scope = ScopeType.INHERIT)
var stacktrace = false var stacktrace = false
@JvmStatic @JvmStatic

View file

@ -9,8 +9,9 @@ package sop
* *
* @param micAlg string identifying the digest mechanism used to create the signed message. This is * @param micAlg string identifying the digest mechanism used to create the signed message. This is
* useful for setting the `micalg=` parameter for the multipart/signed content-type of a PGP/MIME * useful for setting the `micalg=` parameter for the multipart/signed content-type of a PGP/MIME
* object as described in section 5 of [RFC3156]. If more than one signature was generated and * object as described in section 5 of [RFC3156](https://www.rfc-editor.org/rfc/rfc3156#section-5).
* different digest mechanisms were used, the value of the micalg object is an empty string. * If more than one signature was generated and different digest mechanisms were used, the value
* of the micalg object is an empty string.
*/ */
data class SigningResult(val micAlg: MicAlg) { data class SigningResult(val micAlg: MicAlg) {

View file

@ -78,7 +78,7 @@ interface GenerateKey {
fun signingOnly(): GenerateKey fun signingOnly(): GenerateKey
/** /**
* Generate the OpenPGP key and return it encoded as an [InputStream]. * Generate the OpenPGP key and return it encoded as an [java.io.InputStream].
* *
* @return key * @return key
* @throws MissingArg if no user-id was provided * @throws MissingArg if no user-id was provided

View file

@ -16,6 +16,7 @@ import java.io.OutputStream
* target output stream is not yet known. * target output stream is not yet known.
*/ */
@Deprecated("Marked for removal.") @Deprecated("Marked for removal.")
// TODO: Remove in 11.X
class ProxyOutputStream : OutputStream() { class ProxyOutputStream : OutputStream() {
private val buffer = ByteArrayOutputStream() private val buffer = ByteArrayOutputStream()
private var swapped: OutputStream? = null private var swapped: OutputStream? = null