Move Signature factories to separate class

2 files changed, 7 insertions, 2 deletions

diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/RequestSigner.java b/hosted-api/src/main/java/ai/vespa/hosted/api/RequestSigner.java
index 48ff10695d3..cd72c589713 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/RequestSigner.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/RequestSigner.java
@@ -1,6 +1,7 @@
 package ai.vespa.hosted.api;
 
 import com.yahoo.security.KeyUtils;
+import com.yahoo.security.SignatureUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -12,6 +13,7 @@ import java.util.Base64;
 import java.util.function.Supplier;
 
 import static ai.vespa.hosted.api.Signatures.sha256Digest;
+import static com.yahoo.security.SignatureAlgorithm.SHA256_WITH_ECDSA;
 
 /**
  * Signs HTTP request headers using a private key, for verification by the indicated public key.
@@ -31,7 +33,7 @@ public class RequestSigner {
 
     /** Creates a new request signer with a custom clock. */
     public RequestSigner(String pemPrivateKey, String keyId, Clock clock) {
-        this.signer = KeyUtils.createSigner(KeyUtils.fromPemEncodedPrivateKey(pemPrivateKey));
+        this.signer = SignatureUtils.createSigner(KeyUtils.fromPemEncodedPrivateKey(pemPrivateKey), SHA256_WITH_ECDSA);
         this.keyId = keyId;
         this.clock = clock;
     }
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/RequestVerifier.java b/hosted-api/src/main/java/ai/vespa/hosted/api/RequestVerifier.java
index 1d672a56dcb..96a0196bf04 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/RequestVerifier.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/RequestVerifier.java
@@ -1,6 +1,7 @@
 package ai.vespa.hosted.api;
 
 import com.yahoo.security.KeyUtils;
+import com.yahoo.security.SignatureUtils;
 
 import java.net.URI;
 import java.security.Signature;
@@ -10,6 +11,8 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.Base64;
 
+import static com.yahoo.security.SignatureAlgorithm.SHA256_WITH_ECDSA;
+
 /**
  * Verifies that signed HTTP requests match the indicated public key.
  *
@@ -26,7 +29,7 @@ public class RequestVerifier {
     }
 
     public RequestVerifier(String pemPublicKey, Clock clock) {
-        this.verifier = KeyUtils.createVerifier(KeyUtils.fromPemEncodedPublicKey(pemPublicKey));
+        this.verifier = SignatureUtils.createVerifier(KeyUtils.fromPemEncodedPublicKey(pemPublicKey), SHA256_WITH_ECDSA);
         this.clock = clock;
     }