Merge remote-tracking branch 'origin/master'

# Conflicts: # cdoc2-lib/src/main/java/ee/cyber/cdoc2/crypto/keymaterial/DecryptionKeyMaterial.java
open-eid · Sep 2, 2024 · 7c64cb4 · 7c64cb4
2 parents 5411075 + 42592f1
commit 7c64cb4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/cdoc2-cli/src/test/java/cli/CDocCliTest.java b/cdoc2-cli/src/test/java/cli/CDocCliTest.java
@@ -203,7 +203,6 @@ void shouldFailWithTheSameOutputDirectoryWhenReEncrypt(@TempDir Path tempPath) {
         );
     }
 
-
     @Test
     void infoShouldDisplayKeyLabelInDefaultFormatForPassword() throws IOException {
         encrypt(PASSWORD_OPTION);

diff --git a/cdoc2-lib/src/main/java/ee/cyber/cdoc2/crypto/keymaterial/EncryptionKeyMaterial.java b/cdoc2-lib/src/main/java/ee/cyber/cdoc2/crypto/keymaterial/EncryptionKeyMaterial.java
@@ -41,7 +41,7 @@ public interface EncryptionKeyMaterial {
      * For backward compatibility. This method doesn't support correct keylabel generation as there
      * is no info, where pubKey is coming from (pubkey, cert, LDAP)
      * Use {@link #fromPublicKey(PublicKey, KeyLabelParams)} instead.
-     * @deprecated ecryption key
+     * @deprecated encryption key
      * @param pubKey public key
      * @param keyLabel key label
      * @return EncryptionKeyMaterial
-Original file line number
+Diff line change
@@ Expand Up @@
             );
         }
         @Test
         void infoShouldDisplayKeyLabelInDefaultFormatForPassword() throws IOException {
             encrypt(PASSWORD_OPTION);
@@ Expand Down @@