wip

Author: stianst

signing/src/main/java/playground/stianst/github/io/SignatureAlgorithms.java

@@ -28,27 +28,17 @@ public enum SignatureAlgorithms {
     private final String algorithm;
     private final String keyPairAlgorithm;
     private final AlgorithmParameterSpec spec;
-    private final String provider;
 
     SignatureAlgorithms(String algorithm, AlgorithmParameterSpec spec) {
         this.algorithm = algorithm;
         this.keyPairAlgorithm = algorithm;
         this.spec = spec;
-        this.provider = null;
     }
 
     SignatureAlgorithms(String algorithm, String keyPairAlgorithm, AlgorithmParameterSpec spec) {
         this.algorithm = algorithm;
         this.keyPairAlgorithm = keyPairAlgorithm;
         this.spec = spec;
-        this.provider = null;
-    }
-
-    SignatureAlgorithms(String algorithm, String keyPairAlgorithm, AlgorithmParameterSpec spec, String provider) {
-        this.algorithm = algorithm;
-        this.keyPairAlgorithm = keyPairAlgorithm;
-        this.spec = spec;
-        this.provider = provider;
     }
 
     public String getName() {
@@ -66,8 +56,4 @@ public String getKeyPairAlgorithm() {
     public AlgorithmParameterSpec getSpec() {
         return spec;
     }
-
-    public String getProvider() {
-        return provider;
-    }
 }

signing/src/main/java/playground/stianst/github/io/SignatureTest.java

@@ -11,36 +11,43 @@
 
 public class SignatureTest {
 
-    public static final String OUTPUT = "%-15s %-12s %-12s %-12s %-12s%n";
+    public static final int COUNT = 10;
+    public static final boolean SKIP_SLH_DSA = true;
+
+    public static final String OUTPUT = "%-15s %-12s %-12s %-12s %-12s %-12s%n";
 
     public static void main(String[] args) throws Exception {
         Security.addProvider(new BouncyCastleProvider());
 
         String payload = new String(SignatureTest.class.getClassLoader().getResourceAsStream("payload").readAllBytes(), StandardCharsets.UTF_8);
-        int countFast = 100;
-        int countSlow = 1;
 
-        System.out.printf(OUTPUT, "Algorithm", "Size", "Size (url)", "Key Size", "Time (ms)");
+        System.out.printf(OUTPUT, "Algorithm", "Size", "Size (url)", "Key Size", "Time (ms)", "Provider");
         for (SignatureAlgorithms a : SignatureAlgorithms.values()) {
-            KeyPairGenerator keyPairGenerator = a.getProvider() != null ? KeyPairGenerator.getInstance(a.getKeyPairAlgorithm(), a.getProvider()) : KeyPairGenerator.getInstance(a.getKeyPairAlgorithm());
+            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(a.getKeyPairAlgorithm());
             keyPairGenerator.initialize(a.getSpec());
             KeyPair keyPair = keyPairGenerator.generateKeyPair();
 
             byte[] signedBytes = new byte[0];
             long start = System.currentTimeMillis();
 
-            int count = a.getName().startsWith("SLH_DSA") ? countSlow : countFast;
-            for (int i = 0; i <= count; i++) {
-                Signature signature = a.getProvider() != null ? Signature.getInstance(a.getAlgorithm(), a.getProvider()) : Signature.getInstance(a.getAlgorithm());
+            String provider = null;
+
+            if (SKIP_SLH_DSA && a.getAlgorithm().equals("SLHDSA")) {
+                continue;
+            }
+
+            for (int i = 0; i <= COUNT; i++) {
+                Signature signature = Signature.getInstance(a.getAlgorithm());
                 signature.initSign(keyPair.getPrivate());
                 signature.update(payload.getBytes());
                 signedBytes = signature.sign();
+                provider = signature.getProvider().getName();
             }
 
             long time =  System.currentTimeMillis() - start;
             String signatureEncoded = Base64.getUrlEncoder().encodeToString(signedBytes);
 
-            System.out.printf(OUTPUT, a.getName(), signedBytes.length, signatureEncoded.length(), keyPair.getPublic().getEncoded().length, (double) time / count);
+            System.out.printf(OUTPUT, a.getName(), signedBytes.length, signatureEncoded.length(), keyPair.getPublic().getEncoded().length, (double) time / COUNT, provider);
         }
 
     }