use keymanagement 0.0.11-SNAPSHOT, add paramSpec in Encryption/Sighni…

…ng template
adorsys · Nov 28, 2023 · a9568eb · a9568eb
1 parent e2199b3
commit a9568eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
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
@@ -52,6 +52,9 @@ public static class EncryptingKeyCreationCfg {
 
  @Builder.Default
  private final String sigAlgo = "SHA256withECDSA";
+
+ @Builder.Default
+ private final String customNamedCurve = "Curve25519";
  }
 
  @Getter
@@ -66,5 +69,8 @@ public static class SigningKeyCreationCfg {
 
  @Builder.Default
  private final String sigAlgo = "SHA256withECDSA";
+
+ @Builder.Default
+ private final String customNamedCurve = "Curve25519";
  }
 }
diff --git a/...-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/keystore/KeyStoreServiceImpl.java b/...-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/keystore/KeyStoreServiceImpl.java
@@ -19,6 +19,8 @@
 import de.adorsys.keymanagement.api.types.template.generated.Secret;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.bouncycastle.crypto.ec.CustomNamedCurves;
+import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
 
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
@@ -89,6 +91,7 @@ public KeyStore createKeyStore(KeyStoreAuth keyStoreAuth,
  .keySize(encConf.getSize())
  .prefix("ENC")
  .password(passSupplier)
+ .paramSpec(EC5Util.convertToSpec(CustomNamedCurves.getByName(encConf.getCustomNamedCurve())))
  .build()
  .repeat(keyConfig.getEncKeyNumber())
  )

diff --git a/pom.xml b/pom.xml
@@ -119,7 +119,7 @@
  <siv-mode.version>1.4.4</siv-mode.version>
  <jackson.version>2.12.7</jackson.version>
  <jackson-databind.version>2.12.7.1</jackson-databind.version>
- <keymanagement.version>0.0.9</keymanagement.version>
+ <keymanagement.version>0.0.11-SNAPSHOT</keymanagement.version>
  <jakarta.annotation-api.varsion>2.1.1</jakarta.annotation-api.varsion>
  <jaxb-api.version>2.3.1</jaxb-api.version>
  <maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version>