Merge branch 'RM-4153_bug_keylabel_enabled' into 'master'

RM-4153: allow disabling of machine-readable-format for password and secret

See merge request cdoc2/cdoc2-java-ref-impl!73

Author: jann0k

cdoc2-lib/src/main/java/ee/cyber/cdoc2/crypto/keymaterial/encrypt/EncryptionKeyMaterialCollectionBuilder.java

@@ -111,7 +111,7 @@ public EncryptionKeyMaterialCollectionBuilder fromEId(String[] identificationCod
     public EncryptionKeyMaterialCollectionBuilder fromPassword(@Nullable LabeledPassword labeledPassword) {
         if (labeledPassword != null) {
             recipients.add(EncryptionKeyMaterial.fromPassword(labeledPassword.getPassword(),
-                labeledPassword.getKeyLabelParams()));
+                labeledPassword.getLabel()));
         }
         return this;
     }
@@ -127,7 +127,7 @@ public EncryptionKeyMaterialCollectionBuilder fromSecrets(@Nullable LabeledSecre
                 .map(labeledSecret ->
                     EncryptionKeyMaterial.fromSecret(
                         labeledSecret.getSecretKey(),
-                        labeledSecret.getKeyLabelParams()
+                        labeledSecret.getLabel()
                     )
                 )
                 .forEach(encryptionKeyMaterial -> recipients.add(encryptionKeyMaterial));