summaryrefslogtreecommitdiffstats
path: root/athenz-identity-provider-service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2018-09-12 14:26:03 +0200
committerGitHub <noreply@github.com>2018-09-12 14:26:03 +0200
commitb7a3ca37706f204f9a6ba0a088e3ab3d05ff3af2 (patch)
treeb5e9e17270d5640fbe4a45c1d28d3c743cd66b2f /athenz-identity-provider-service
parentf987e181fdf9843c81ba69b9f3093d490d0cfa4e (diff)
parent6de8d71da5c3ff81091c756271b62fb57b5cfd9a (diff)
Merge pull request #6908 from vespa-engine/bjorncs/ec-pem-support
Bjorncs/ec pem support
Diffstat (limited to 'athenz-identity-provider-service')
-rw-r--r--athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AutoGeneratedKeyProvider.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AutoGeneratedKeyProvider.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AutoGeneratedKeyProvider.java
index ca6b5529b08..74e9b02e150 100644
--- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AutoGeneratedKeyProvider.java
+++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AutoGeneratedKeyProvider.java
@@ -1,6 +1,9 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.athenz.instanceproviderservice;
+import com.yahoo.security.KeyAlgorithm;
+import com.yahoo.security.KeyUtils;
+
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.NoSuchAlgorithmException;
@@ -15,13 +18,7 @@ public class AutoGeneratedKeyProvider implements KeyProvider {
private final KeyPair keyPair;
public AutoGeneratedKeyProvider() {
- try {
- KeyPairGenerator rsa = KeyPairGenerator.getInstance("RSA");
- rsa.initialize(2048);
- keyPair = rsa.genKeyPair();
- } catch (NoSuchAlgorithmException e) {
- throw new RuntimeException(e);
- }
+ keyPair = KeyUtils.generateKeypair(KeyAlgorithm.RSA, 2048);
}
@Override