fix tests

adorsys · Feb 6, 2024 · e4dba7d · e4dba7d
1 parent 6edf473
commit e4dba7d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 8 deletions.
diff --git a/...n-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/keystore/PublicKeySerdeImpl.java b/...n-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/...fe-encryption/datasafe-encryption-impl/src/test/resources/config-test/mutable-pbkdf2.yaml b/...fe-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/...fe-encryption/datasafe-encryption-impl/src/test/resources/config-test/mutable-scrypt.yaml b/...fe-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/...ncryption-impl/src/test/resources/config-test/null-test/expectation/mutable-null-cms.yaml b/...ncryption-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/...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
@@ -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/...tion-impl/src/test/resources/config-test/null-test/expectation/mutable-null-keystore.yaml b/...tion-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/...n/datasafe-encryption-impl/src/test/resources/config-test/null-test/mutable-null-cms.yaml b/...n/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/...asafe-encryption-impl/src/test/resources/config-test/null-test/mutable-null-keystore.yaml b/...asafe-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