From c872e3b43d0ae0dd409cf9498f0b1dabd8c2c6a6 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Tue, 30 Apr 2019 13:29:25 +0200 Subject: Use KeyUtils to read keys --- hosted-api/src/test/java/ai/vespa/hosted/api/SignaturesTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'hosted-api/src/test') diff --git a/hosted-api/src/test/java/ai/vespa/hosted/api/SignaturesTest.java b/hosted-api/src/test/java/ai/vespa/hosted/api/SignaturesTest.java index 67a99168341..074f117167b 100644 --- a/hosted-api/src/test/java/ai/vespa/hosted/api/SignaturesTest.java +++ b/hosted-api/src/test/java/ai/vespa/hosted/api/SignaturesTest.java @@ -1,5 +1,6 @@ package ai.vespa.hosted.api; +import com.yahoo.security.KeyUtils; import org.junit.Test; import java.io.ByteArrayInputStream; @@ -14,8 +15,6 @@ import java.time.ZoneOffset; import static ai.vespa.hosted.api.Signatures.decrypted; import static ai.vespa.hosted.api.Signatures.encrypted; -import static ai.vespa.hosted.api.Signatures.parsePrivatePemPkcs8RsaKey; -import static ai.vespa.hosted.api.Signatures.parsePublicPemX509RsaKey; import static ai.vespa.hosted.api.Signatures.sha256Digest; import static ai.vespa.hosted.api.Signatures.sha256Digester; import static java.nio.charset.StandardCharsets.UTF_8; @@ -127,8 +126,8 @@ public class SignaturesTest { @Test public void testEncryption() { - Key privateKey = parsePrivatePemPkcs8RsaKey(pemPrivateKey); - Key publicKey = parsePublicPemX509RsaKey(pemPublicKey); + Key privateKey = KeyUtils.fromPemEncodedPrivateKey(pemPrivateKey); + Key publicKey = KeyUtils.fromPemEncodedPublicKey(pemPublicKey); assertArrayEquals(message, decrypted(encrypted(message, privateKey), publicKey)); assertArrayEquals(message, decrypted(encrypted(message, publicKey), privateKey)); -- cgit v1.2.3