diff options
| author | Andreas Eriksen <andreer@verizonmedia.com> | 2019-09-23 11:49:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 11:49:32 +0200 |
| commit | 4d00bb40718ab4e01230e1492d73a2d92e0124f9 (patch) | |
| tree | b089d408da1656eeae487360cb0414b62f31bea9 | |
| parent | 4a0f3acd2bfcabe23690ac27787dfebb62e58ad1 (diff) | |
| parent | 6deabb9ef483a8aeb49c384258dad93661bee920 (diff) | |
Merge pull request #10764 from vespa-engine/jvenstad/rsa-key-for-tester
Try RSA key pair for tester
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 797b28a25b4..a3c8459343b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -660,13 +660,13 @@ public class InternalStepRunner implements StepRunner { } private void appendAndStoreCertificate(ZipBuilder zipBuilder, RunId id) { - KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC, 256); + KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.RSA, 2048); X500Principal subject = new X500Principal("CN=" + id.tester().id().toFullString() + "." + id.type() + "." + id.number()); X509Certificate certificate = X509CertificateBuilder.fromKeypair(keyPair, subject, controller.clock().instant(), controller.clock().instant().plus(certificateTimeout), - SignatureAlgorithm.SHA512_WITH_ECDSA, + SignatureAlgorithm.SHA512_WITH_RSA, BigInteger.valueOf(1)) .build(); controller.jobController().storeTesterCertificate(id, certificate); |