diff --git a/helper/src/main/kotlin/cfig/helper/CryptoHelper.kt b/helper/src/main/kotlin/cfig/helper/CryptoHelper.kt index 3233634..d43b0c2 100644 --- a/helper/src/main/kotlin/cfig/helper/CryptoHelper.kt +++ b/helper/src/main/kotlin/cfig/helper/CryptoHelper.kt @@ -14,10 +14,7 @@ import org.slf4j.LoggerFactory import java.io.* import java.math.BigInteger import java.math.RoundingMode -import java.security.KeyFactory -import java.security.KeyStore -import java.security.MessageDigest -import java.security.Security +import java.security.* import java.security.cert.Certificate import java.security.cert.CertificateFactory import java.security.spec.PKCS8EncodedKeySpec @@ -91,7 +88,7 @@ class CryptoHelper { } if (bSuccess) return KeyBox( KeyFormat.DER, - sun.security.rsa.RSAPrivateCrtKeyImpl::class, + PrivateKey::class, ret ) //try 2 diff --git a/src/integrationTest/resources b/src/integrationTest/resources index e228732..8b7e5fb 160000 --- a/src/integrationTest/resources +++ b/src/integrationTest/resources @@ -1 +1 @@ -Subproject commit e22873286ef13ebaf60d39dd51405cb6825cef97 +Subproject commit 8b7e5fba4fe3dc9773f5156e9597c82a616a93ff diff --git a/src/integrationTest/resources_2 b/src/integrationTest/resources_2 index ce834db..bf966f6 160000 --- a/src/integrationTest/resources_2 +++ b/src/integrationTest/resources_2 @@ -1 +1 @@ -Subproject commit ce834dbe0bb8b307b45480d6724a33ee928bbaff +Subproject commit bf966f66a1546fbb3f765ad6daeea42db57342e1