Skip to content

Commit 92e5169

Browse files
committed
RM-4153: allow disabling of machine-readable-format for password and secret with -Dee.cyber.cdoc2.key-label.machine-readable-format.enabled=false
1 parent a221252 commit 92e5169

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public EncryptionKeyMaterialCollectionBuilder fromEId(String[] identificationCod
111111
public EncryptionKeyMaterialCollectionBuilder fromPassword(@Nullable LabeledPassword labeledPassword) {
112112
if (labeledPassword != null) {
113113
recipients.add(EncryptionKeyMaterial.fromPassword(labeledPassword.getPassword(),
114-
labeledPassword.getKeyLabelParams()));
114+
labeledPassword.getLabel()));
115115
}
116116
return this;
117117
}
@@ -127,7 +127,7 @@ public EncryptionKeyMaterialCollectionBuilder fromSecrets(@Nullable LabeledSecre
127127
.map(labeledSecret ->
128128
EncryptionKeyMaterial.fromSecret(
129129
labeledSecret.getSecretKey(),
130-
labeledSecret.getKeyLabelParams()
130+
labeledSecret.getLabel()
131131
)
132132
)
133133
.forEach(encryptionKeyMaterial -> recipients.add(encryptionKeyMaterial));

0 commit comments

Comments
 (0)