From 65b7e0893c711c79d5ddf22904eaf8b491f2c7de Mon Sep 17 00:00:00 2001
From: Thendo20 <thendorabali43@gmail.com>
Date: Mon, 24 Jun 2024 10:36:44 +0200
Subject: [PATCH] Added mutable encryption config to BasicFunctionalityIT

---
 .../src/test/resources/config/mutable.yaml    | 20 +++++++++----------
 .../encryption/MutableEncryptionConfig.java   |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/datasafe-business/src/test/resources/config/mutable.yaml b/datasafe-business/src/test/resources/config/mutable.yaml
index 8159e3c64..2be9d8689 100644
--- a/datasafe-business/src/test/resources/config/mutable.yaml
+++ b/datasafe-business/src/test/resources/config/mutable.yaml
@@ -4,10 +4,10 @@ keystore:
   encryptionAlgo: AES256_KWP
   pbkdf:
     scrypt:
-      cost: 1
-      blockSize: 2
-      parallelization: 3
-      saltLength: 32
+      cost: 16384
+      blockSize: 8
+      parallelization: 1
+      saltLength: 16
   macAlgo: HmacSHA3_512
   passwordKeysAlgo: PBEWithHmacSHA256AndAES_256
 keys:
@@ -15,16 +15,16 @@ keys:
   signKeyNumber: 2
   secret:
     algo: AES
-    size: 512
+    size: 256
   encrypting:
     algo: RSA
-    size: 256
+    size: 2048
     sigAlgo: SHA256withRSA
-#    curve:
+#    curve: NULL
   signing:
     algo: RSA
-    size: 256
+    size: 2048
     sigAlgo: SHA256withRSA
-#    curve: curve
+#    curve: NULL
 cms:
-  algo: SHA256withRSA
\ No newline at end of file
+  algo: AES256_GCM
\ No newline at end of file
diff --git a/datasafe-encryption/datasafe-encryption-api/src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/MutableEncryptionConfig.java b/datasafe-encryption/datasafe-encryption-api/src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/MutableEncryptionConfig.java
index 37f42ae24..7c13e358c 100644
--- a/datasafe-encryption/datasafe-encryption-api/src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/MutableEncryptionConfig.java
+++ b/datasafe-encryption/datasafe-encryption-api/src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/MutableEncryptionConfig.java
@@ -200,9 +200,9 @@ KeyCreationConfig.EncryptingKeyCreationCfg toEncryptingKeyCreationCfg() {
                     builder.sigAlgo(sigAlgo);
                 }
 
-                if (null != curve) {
+
                     builder.curve(curve);
-                }
+
 
                 return builder.build();
             }
@@ -231,9 +231,9 @@ KeyCreationConfig.SigningKeyCreationCfg toSigningKeyCreationCfg() {
                     builder.sigAlgo(sigAlgo);
                 }
 
-                if (null != curve) {
+
                     builder.curve(curve);
-                }
+
 
                 return builder.build();
             }