Fix addressed pull request review comments

adorsys · May 28, 2024 · 99891c5 · 99891c5
1 parent b287a84
commit 99891c5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.../src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/KeyCreationConfig.java b/.../src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/KeyCreationConfig.java
@@ -54,7 +54,7 @@ public static class EncryptingKeyCreationCfg {
  private final String sigAlgo = "SHA256withECDSA";
 
  @Builder.Default
- private final String curve = "Curve25519";
+ private final String curve = "secp256r1";
  }
 
  @Getter

diff --git a/...main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java b/...main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java
@@ -85,7 +85,7 @@ public JceKeyAgreeRecipientInfoGenerator getJceKeyAgreeRecipientInfoGenerator(Ke
  CMSAlgorithm.ECDH_SHA256KDF,
  senderKeyPair.getPrivate(),
  senderKeyPair.getPublic(),
- CMSAlgorithm.AES128_WRAP);
+ CMSAlgorithm.AES256_WRAP);
  jceKeyAgreeRecipientInfoGenerator.addRecipient(publicKeyWithId.getKeyID().getValue().getBytes(), publicKeyWithId.getPublicKey());
  return jceKeyAgreeRecipientInfoGenerator;
  }

diff --git a/.../java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/decryptors/KeyAgreeDecryptor.java b/.../java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/decryptors/KeyAgreeDecryptor.java
@@ -24,9 +24,9 @@ public class KeyAgreeDecryptor extends Decryptor {
 
  @Override
  @SneakyThrows
- public InputStream decryptionStream(Key key) {
+ public InputStream decryptionStream(Key privateKey) {
  return recipientInfo
- .getContentStream(new JceKeyAgreeEnvelopedRecipient((PrivateKey) key))
+ .getContentStream(new JceKeyAgreeEnvelopedRecipient((PrivateKey) privateKey))
  .getContentStream();
  }
 }
diff --git a/...cryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-keys.yaml b/...cryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-keys.yaml
@@ -20,11 +20,11 @@ keys:
  algo: ECDH
  size: 256
  sigAlgo: SHA256withECDSA
- curve: Curve25519
+ curve: secp256r1
  signing:
  algo: ECDH
  size: 256
  sigAlgo: SHA256withECDSA
- curve: Curve25519
+ curve: secp256r1
 cms:
  algo: cms-algo1