CHANGELOG.md

@@ -6,10 +6,6 @@ SPDX-License-Identifier: Apache-2.0
 
 # 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
 - `sop-java`:
   - Remove `label()` option from `armor()` subcommand

external-sop/src/main/kotlin/sop/external/operation/EncryptExternal.kt

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

sop-java-picocli/src/main/kotlin/sop/cli/picocli/SopCLI.kt

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

sop-java/src/main/kotlin/sop/SigningResult.kt

@@ -9,9 +9,8 @@ package sop
  *
  * @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
- *   object as described in section 5 of [RFC3156](https://www.rfc-editor.org/rfc/rfc3156#section-5).
+ *   object as described in section 5 of [RFC3156]. If more than one signature was generated and
- *   If more than one signature was generated and different digest mechanisms were used, the value
+ *   different digest mechanisms were used, the value of the micalg object is an empty string.
- *   of the micalg object is an empty string.
  */
 data class SigningResult(val micAlg: MicAlg) {
 

sop-java/src/main/kotlin/sop/operation/GenerateKey.kt

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

sop-java/src/main/kotlin/sop/util/ProxyOutputStream.kt

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