From d3ced01c77e824814fe28fe2078ded5550f5f8e7 Mon Sep 17 00:00:00 2001 From: Thendo20 Date: Mon, 1 Jul 2024 15:48:10 +0200 Subject: [PATCH] Added two new tests for KeyStoreService and one test for CmsEncryptionServiceImpl --- .../impl/cmsencryption/CmsEncryptionServiceImplTest.java | 4 ++-- .../encrypiton/impl/keystore/KeyStoreServiceTest.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/datasafe-encryption/datasafe-encryption-impl/src/test/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CmsEncryptionServiceImplTest.java b/datasafe-encryption/datasafe-encryption-impl/src/test/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CmsEncryptionServiceImplTest.java index 490748a62..a46bd2a37 100644 --- a/datasafe-encryption/datasafe-encryption-impl/src/test/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CmsEncryptionServiceImplTest.java +++ b/datasafe-encryption/datasafe-encryption-impl/src/test/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CmsEncryptionServiceImplTest.java @@ -151,8 +151,8 @@ void cmsStreamEnvelopeEncryptAndDecryptTestCustom() { KeyStoreAuth keyStoreAuth = new KeyStoreAuth(readStorePassword, readKeyPassword); KeyCreationConfig config = KeyCreationConfig.builder() - .signing(KeyCreationConfig.SigningKeyCreationCfg.builder().algo("RSA").size(2048).sigAlgo( "SHA256withRSA").curve("null").build()) - .encrypting(KeyCreationConfig.EncryptingKeyCreationCfg.builder().algo("RSA").size(2048).sigAlgo("SHA256withRSA").curve("null").build()) + .signing(KeyCreationConfig.SigningKeyCreationCfg.builder().algo("RSA").size(2048).sigAlgo( "SHA256withRSA").curve(null).build()) + .encrypting(KeyCreationConfig.EncryptingKeyCreationCfg.builder().algo("RSA").size(2048).sigAlgo("SHA256withRSA").curve(null).build()) .build(); KeyStore keyStore = keyStoreService.createKeyStore(keyStoreAuth, config); diff --git a/datasafe-encryption/datasafe-encryption-impl/src/test/java/de/adorsys/datasafe/encrypiton/impl/keystore/KeyStoreServiceTest.java b/datasafe-encryption/datasafe-encryption-impl/src/test/java/de/adorsys/datasafe/encrypiton/impl/keystore/KeyStoreServiceTest.java index e4718f208..921120e65 100644 --- a/datasafe-encryption/datasafe-encryption-impl/src/test/java/de/adorsys/datasafe/encrypiton/impl/keystore/KeyStoreServiceTest.java +++ b/datasafe-encryption/datasafe-encryption-impl/src/test/java/de/adorsys/datasafe/encrypiton/impl/keystore/KeyStoreServiceTest.java @@ -26,6 +26,7 @@ import javax.crypto.SecretKey; import java.security.KeyStore; import java.security.PrivateKey; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -75,7 +76,7 @@ void updateKeyStoreReadKeyPassword() throws Exception { KeyStore keyStore = keyStoreService.createKeyStore(keyStoreAuth, config); KeyStoreAuth newKeystoreAuth = new KeyStoreAuth(new ReadStorePassword("newstorepass"), new ReadKeyPassword("newkeypass".toCharArray())); KeyStore updatedKeyStore = keyStoreService.updateKeyStoreReadKeyPassword(keyStore, keyStoreAuth, newKeystoreAuth); - Assertions.assertEquals("newkeypass", newKeystoreAuth.getReadKeyPassword().getValue()); + Assertions.assertTrue(Arrays.equals("newkeypass".toCharArray(), newKeystoreAuth.getReadKeyPassword().getValue())); } @Test void addPasswordBasedSecretKey() {