From e4dba7dc45093ed67e5d17180887f2e76681ee3b Mon Sep 17 00:00:00 2001 From: Maxim Grischenko Date: Tue, 6 Feb 2024 17:15:36 +0100 Subject: [PATCH] fix tests --- .../impl/keystore/PublicKeySerdeImpl.java | 4 ++-- .../test/resources/config-test/mutable-pbkdf2.yaml | 2 ++ .../test/resources/config-test/mutable-scrypt.yaml | 2 ++ .../null-test/expectation/mutable-null-cms.yaml | 2 ++ .../null-test/expectation/mutable-null-keys.yaml | 14 ++++++++------ .../expectation/mutable-null-keystore.yaml | 2 ++ .../config-test/null-test/mutable-null-cms.yaml | 2 ++ .../null-test/mutable-null-keystore.yaml | 2 ++ 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/keystore/PublicKeySerdeImpl.java b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/keystore/PublicKeySerdeImpl.java index 802fdf9b4..a688b0836 100644 --- a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/keystore/PublicKeySerdeImpl.java +++ b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/keystore/PublicKeySerdeImpl.java @@ -32,9 +32,9 @@ public PublicKey readPubKey(String encoded) { // FIXME: Legacy stuff byte[] bytes = Base64.getDecoder().decode(encoded); SubjectPublicKeyInfo subjectPublicKeyInfo = SubjectPublicKeyInfo.getInstance(bytes); - if (RSA.equals(subjectPublicKeyInfo.getAlgorithm())) { + if (RSA.equals(subjectPublicKeyInfo.getAlgorithm().getAlgorithm())) { return new org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi().generatePublic(SubjectPublicKeyInfo.getInstance(bytes)); - } else if (EC.equals(subjectPublicKeyInfo.getAlgorithm())) { + } else if (EC.equals(subjectPublicKeyInfo.getAlgorithm().getAlgorithm())) { return new org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi.ECDH().generatePublic(subjectPublicKeyInfo); } throw new DecryptionException("PublicKeySerdeImpl.UnsupportedEncodedKey"); diff --git a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/mutable-pbkdf2.yaml b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/mutable-pbkdf2.yaml index 6eeed0a7d..c0c2dc6df 100644 --- a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/mutable-pbkdf2.yaml +++ b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/mutable-pbkdf2.yaml @@ -19,9 +19,11 @@ keys: algo: enc-algo size: 13 sigAlgo: srv-sig-algo + curve: curve signing: algo: sig-algo size: 14 sigAlgo: srv-sig-algo + curve: curve cms: algo: cms-algo1 diff --git a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/mutable-scrypt.yaml b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/mutable-scrypt.yaml index 35e8c75cf..73cff026a 100644 --- a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/mutable-scrypt.yaml +++ b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/mutable-scrypt.yaml @@ -20,9 +20,11 @@ keys: algo: enc-algo size: 13 sigAlgo: srv-sig-algo + curve: curve signing: algo: sig-algo size: 14 sigAlgo: srv-sig-algo + curve: curve cms: algo: cms-algo1 diff --git a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-cms.yaml b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-cms.yaml index 0ceb75fc9..40554add3 100644 --- a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-cms.yaml +++ b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-cms.yaml @@ -20,9 +20,11 @@ keys: algo: enc-algo size: 13 sigAlgo: srv-sig-algo + curve: curve signing: algo: sig-algo size: 14 sigAlgo: srv-sig-algo + curve: curve cms: algo: AES256_GCM diff --git a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-keys.yaml b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-keys.yaml index 5c78c8f3a..c6a8d0e00 100644 --- a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-keys.yaml +++ b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-keys.yaml @@ -17,12 +17,14 @@ keys: algo: AES size: 256 encrypting: - algo: RSA - size: 2048 - sigAlgo: SHA256withRSA + algo: ECDH + size: 256 + sigAlgo: SHA256withECDSA + curve: Curve25519 signing: - algo: RSA - size: 2048 - sigAlgo: SHA256withRSA + algo: ECDH + size: 256 + sigAlgo: SHA256withECDSA + curve: Curve25519 cms: algo: cms-algo1 diff --git a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-keystore.yaml b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-keystore.yaml index 2f891c9c3..807f54be4 100644 --- a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-keystore.yaml +++ b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-keystore.yaml @@ -19,9 +19,11 @@ keys: algo: enc-algo size: 13 sigAlgo: srv-sig-algo + curve: curve signing: algo: sig-algo size: 14 sigAlgo: srv-sig-algo + curve: curve cms: algo: cms-algo1 diff --git a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/mutable-null-cms.yaml b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/mutable-null-cms.yaml index 87a1dcd0d..aa1bfdb85 100644 --- a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/mutable-null-cms.yaml +++ b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/mutable-null-cms.yaml @@ -20,7 +20,9 @@ keys: algo: enc-algo size: 13 sigAlgo: srv-sig-algo + curve: curve signing: algo: sig-algo size: 14 sigAlgo: srv-sig-algo + curve: curve diff --git a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/mutable-null-keystore.yaml b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/mutable-null-keystore.yaml index 2f431a353..9d596638e 100644 --- a/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/mutable-null-keystore.yaml +++ b/datasafe-encryption/datasafe-encryption-impl/src/test/resources/config-test/null-test/mutable-null-keystore.yaml @@ -9,9 +9,11 @@ keys: algo: enc-algo size: 13 sigAlgo: srv-sig-algo + curve: curve signing: algo: sig-algo size: 14 sigAlgo: srv-sig-algo + curve: curve cms: algo: cms-algo1