diff --git a/datasafe-encryption/datasafe-encryption-api/src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/KeyCreationConfig.java b/datasafe-encryption/datasafe-encryption-api/src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/KeyCreationConfig.java index 9bab88b51..1434414bd 100644 --- a/datasafe-encryption/datasafe-encryption-api/src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/KeyCreationConfig.java +++ b/datasafe-encryption/datasafe-encryption-api/src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/KeyCreationConfig.java @@ -45,13 +45,13 @@ public static class SecretKeyCreationCfg { public static class EncryptingKeyCreationCfg { @Builder.Default - private final String algo = "RSA"; + private final String algo = "ECDH"; @Builder.Default - private final int size = 2048; + private final int size = 256; @Builder.Default - private final String sigAlgo = "SHA256withRSA"; + private final String sigAlgo = "SHA256withECDSA"; } @Getter @@ -59,12 +59,12 @@ public static class EncryptingKeyCreationCfg { public static class SigningKeyCreationCfg { @Builder.Default - private final String algo = "RSA"; + private final String algo = "ECDH"; @Builder.Default - private final int size = 2048; + private final int size = 256; @Builder.Default - private final String sigAlgo = "SHA256withRSA"; + private final String sigAlgo = "SHA256withECDSA"; } } diff --git a/datasafe-rest-impl/src/main/resources/application.properties b/datasafe-rest-impl/src/main/resources/application.properties index 0c7f28841..549395490 100644 --- a/datasafe-rest-impl/src/main/resources/application.properties +++ b/datasafe-rest-impl/src/main/resources/application.properties @@ -36,3 +36,11 @@ datasafe.encryption.keystore.pbkdf.scrypt.parallelization=1 datasafe.encryption.keystore.pbkdf.scrypt.saltLength=16 datasafe.encryption.keystore.macAlgo=HmacSHA3_512 datasafe.encryption.cms.algo=AES256_GCM + +#datasafe.encryption.keys.encrypting.algo=RSA +#datasafe.encryption.keys.encrypting.size=4096 +#datasafe.encryption.keys.encrypting.sigAlgo=SHA256withRSA + +#datasafe.encryption.keys.signing.algo=RSA +#datasafe.encryption.keys.signing.size=4096 +#datasafe.encryption.keys.signing.sigAlgo=SHA256withRSA diff --git a/pom.xml b/pom.xml index b0f4b6665..d99061ef2 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ 1.4.4 2.12.7 2.12.7.1 - 0.0.7 + 0.0.8-SNAPSHOT 2.1.1 2.3.1 2.8.1