Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cdoc2-lib/src/main/java/ee/cyber/cdoc2/crypto/keymaterial/DecryptionKeyMaterial.java

Author: jann0k

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);

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