Updated BouncyCastle tests and corresponding stubs

Author: fegge

java/ql/test/experimental/library-tests/quantum/BouncyCastle/ECDSAP256SignAndVerify.java

@@ -1,5 +1,7 @@
 import java.security.Security;
 import java.security.SecureRandom;
+import java.security.interfaces.ECPrivateKey;
+import java.security.interfaces.ECPublicKey;
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
 import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
 import org.bouncycastle.crypto.params.ECDomainParameters;
@@ -8,54 +10,114 @@
 import org.bouncycastle.crypto.params.ECPublicKeyParameters;
 import org.bouncycastle.crypto.signers.ECDSASigner;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
+import org.bouncycastle.jce.spec.ECNamedCurveSpec;
+import org.bouncycastle.jce.ECNamedCurveTable;
 import org.bouncycastle.asn1.sec.SECNamedCurves;
 import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.math.ec.ECCurve;
+import org.bouncycastle.math.ec.ECPoint;
 
 /**
- * Example of using Bouncy Castle's low-level API for ECDSA signing and verification over P-256.
+ * Test Bouncy Castle's low-level ECDSA API
  */
 public class ECDSAP256SignAndVerify {
+    
     public static void main(String[] args) {
         // Add Bouncy Castle provider
         Security.addProvider(new BouncyCastleProvider());
 
         try {
-            // Get P-256 curve parameters using BouncyCastle's SECNamedCurves
-            String curveName = "secp256r1";
-            X9ECParameters ecParams = SECNamedCurves.getByName(curveName);
-            ECDomainParameters domainParams = new ECDomainParameters(ecParams);
-            
-            // Generate a key pair
-            SecureRandom random = new SecureRandom();
-            ECKeyPairGenerator keyPairGenerator = new ECKeyPairGenerator();
-            ECKeyGenerationParameters keyGenParams = new ECKeyGenerationParameters(domainParams, random);
-            keyPairGenerator.init(keyGenParams);
-            AsymmetricCipherKeyPair keyPair = keyPairGenerator.generateKeyPair();
-            
-            ECPrivateKeyParameters privateKey = (ECPrivateKeyParameters) keyPair.getPrivate();
-            ECPublicKeyParameters publicKey = (ECPublicKeyParameters) keyPair.getPublic();
-            
             byte[] message = "Hello, ECDSA P-256 signature!".getBytes("UTF-8");
 
-            // Sign the message
-            ECDSASigner signer = new ECDSASigner();
-            signer.init(true, privateKey); // true for signing
-            // Note: ECDSA typically signs a hash of the message, not the message directly
-            // For simplicity, we're signing the message bytes directly here
-            java.math.BigInteger[] signature = signer.generateSignature(message);
-            
-            System.out.println("Signature generated!");
-            System.out.println("Signature r: " + signature[0].toString(16));
-            System.out.println("Signature s: " + signature[1].toString(16));
-            
-            // Verify the signature
-            ECDSASigner verifier = new ECDSASigner();
-            verifier.init(false, publicKey); // false for verification
-            boolean verified = verifier.verifySignature(message, signature[0], signature[1]);
-            
-            System.out.println("Signature verified: " + verified);
+            // Test different key generation methods
+            signWithKeyPair(generateKeyPair1(), message);
+            signWithKeyPair(generateKeyPair2(), message);
+            signWithKeyPair(generateKeyPair3(), message);
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
+    
+    /**
+     * Method 1: Generate key pair with SECNamedCurves
+     */
+    private static AsymmetricCipherKeyPair generateKeyPair1() throws Exception {
+        // Get P-256 curve parameters using BouncyCastle's SECNamedCurves
+        String curveName = "secp256r1";
+        X9ECParameters ecParams = SECNamedCurves.getByName(curveName);
+        ECDomainParameters domainParams = new ECDomainParameters(ecParams);
+        
+        // Generate a key pair
+        SecureRandom random = new SecureRandom();
+        ECKeyPairGenerator keyPairGenerator = new ECKeyPairGenerator();
+        ECKeyGenerationParameters keyGenParams = new ECKeyGenerationParameters(domainParams, random);
+        keyPairGenerator.init(keyGenParams);
+        
+        return keyPairGenerator.generateKeyPair();
+    }
+
+    /**
+     * Method 2: Generate key pair with explicit curve construction
+     */
+    private static AsymmetricCipherKeyPair generateKeyPair2() throws Exception {
+        // Get the X9.62 parameters and construct domain parameters explicitly
+        String curveName = "secp256k1";
+        X9ECParameters x9Params = SECNamedCurves.getByName(curveName);
+        ECCurve curve = x9Params.getCurve();
+        ECPoint g = x9Params.getG();
+        java.math.BigInteger n = x9Params.getN();
+        java.math.BigInteger h = x9Params.getH();
+        
+        // Create domain parameters with explicit values
+        ECDomainParameters domainParams = new ECDomainParameters(curve, g, n, h);
+        
+        SecureRandom random = new SecureRandom();
+        ECKeyPairGenerator keyPairGenerator = new ECKeyPairGenerator();
+        ECKeyGenerationParameters keyGenParams = new ECKeyGenerationParameters(domainParams, random);
+        keyPairGenerator.init(keyGenParams);
+        
+        return keyPairGenerator.generateKeyPair();
+    }
+
+    
+    /**
+     * Method 3: Generate key pair using ECNamedCurveTable 
+     */
+    private static AsymmetricCipherKeyPair generateKeyPair3() throws Exception {
+        // Get curve parameters using ECNamedCurveTable
+        String curveName = "secp384r1";
+        ECNamedCurveParameterSpec ecSpec = ECNamedCurveTable.getParameterSpec(curveName);
+        ECDomainParameters domainParams = new ECDomainParameters(
+            ecSpec.getCurve(), 
+            ecSpec.getG(), 
+            ecSpec.getN(), 
+            ecSpec.getH()
+        );
+        
+        SecureRandom random = new SecureRandom();
+        ECKeyPairGenerator keyPairGenerator = new ECKeyPairGenerator();
+        ECKeyGenerationParameters keyGenParams = new ECKeyGenerationParameters(domainParams, random);
+        keyPairGenerator.init(keyGenParams);
+        
+        return keyPairGenerator.generateKeyPair();
+    }
+    
+    /**
+     * Test signing and verification with BouncyCastle low-level key pair
+     */
+    private static void signWithKeyPair(AsymmetricCipherKeyPair keyPair, byte[] message) throws Exception {
+        ECPrivateKeyParameters privateKey = (ECPrivateKeyParameters) keyPair.getPrivate();
+        ECPublicKeyParameters publicKey = (ECPublicKeyParameters) keyPair.getPublic();
+        
+        // Sign the message
+        ECDSASigner signer = new ECDSASigner();
+        signer.init(true, privateKey); // true for signing
+        java.math.BigInteger[] signature = signer.generateSignature(message);
+        
+        // Verify the signature
+        ECDSASigner verifier = new ECDSASigner();
+        verifier.init(false, publicKey); // false for verification
+        boolean verified = verifier.verifySignature(message, signature[0], signature[1]);
+    }
 }

java/ql/test/experimental/library-tests/quantum/BouncyCastle/LMSSignature.java

@@ -0,0 +1,58 @@
+import java.security.SecureRandom;
+import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
+import org.bouncycastle.pqc.crypto.lms.LMSKeyPairGenerator;
+import org.bouncycastle.pqc.crypto.lms.LMSKeyGenerationParameters;
+import org.bouncycastle.pqc.crypto.lms.LMSParameters;
+import org.bouncycastle.pqc.crypto.lms.LMSPrivateKeyParameters;
+import org.bouncycastle.pqc.crypto.lms.LMSPublicKeyParameters;
+import org.bouncycastle.pqc.crypto.lms.LMSSigner;
+import org.bouncycastle.pqc.crypto.lms.LMSigParameters;
+import org.bouncycastle.pqc.crypto.lms.LMOtsParameters;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.Security;
+
+/**
+ * Example of the Leighton-Micali Signature (LMS) scheme using Bouncy Castle's
+ * low-level API.
+ * 
+ */
+public class LMSSignature {
+    public static void main(String[] args) {
+        Security.addProvider(new BouncyCastleProvider());
+        
+        try {
+            // Set up LMS parameters
+            LMSParameters lmsParameters = new LMSParameters(
+                    LMSigParameters.lms_sha256_n32_h10,
+                    LMOtsParameters.sha256_n32_w8);
+            
+            // Generate key pair
+            SecureRandom random = new SecureRandom();
+            LMSKeyPairGenerator keyPairGen = new LMSKeyPairGenerator();
+            keyPairGen.init(new LMSKeyGenerationParameters(lmsParameters, random));
+            AsymmetricCipherKeyPair keyPair = keyPairGen.generateKeyPair();
+            
+            LMSPrivateKeyParameters privateKey = (LMSPrivateKeyParameters) keyPair.getPrivate();
+            LMSPublicKeyParameters publicKey = (LMSPublicKeyParameters) keyPair.getPublic();
+            
+            byte[] message = "Hello, LMS signature!".getBytes("UTF-8");
+            
+            LMSSigner signer = new LMSSigner();
+            
+            // Sign the message
+            signer.init(true, privateKey); // true for signing
+            byte[] signature = signer.generateSignature(message);
+            
+            // Verify the signature
+            //
+            // TODO: Using the same signer instance for verification causes both
+            // keys to be reported. This should be handled using dataflow.
+            signer.init(false, publicKey);   
+            boolean verified = signer.verifySignature(message, signature);
+            
+            System.out.println("Signature verified: " + verified);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

java/ql/test/experimental/library-tests/quantum/BouncyCastle/key_artifacts.expected

@@ -1,6 +1,6 @@
-| ECDSAP256SignAndVerify.java:33:47:33:80 | Key | Unknown |
-| ECDSAP256SignAndVerify.java:33:47:33:80 | Key | secp256r1 |
-| Ed448SignAndVerify.java:21:47:21:80 | Key | Curve25519 |
+| ECDSAP256SignAndVerify.java:57:16:57:49 | Key | Unknown |
+| ECDSAP256SignAndVerify.java:80:16:80:49 | Key | Unknown |
+| ECDSAP256SignAndVerify.java:103:16:103:49 | Key | Unknown |
 | Ed448SignAndVerify.java:21:47:21:80 | Key | Ed448 |
-| Ed25519SignAndVerify.java:21:47:21:80 | Key | Curve25519 |
 | Ed25519SignAndVerify.java:21:47:21:80 | Key | Ed25519 |
+| LMSSignature.java:33:47:33:74 | Key | LMS |

java/ql/test/experimental/library-tests/quantum/BouncyCastle/key_generation_operations.expected

@@ -1,6 +1,6 @@
-| ECDSAP256SignAndVerify.java:33:47:33:80 | KeyGeneration | ECDSAP256SignAndVerify.java:24:32:24:42 | EllipticCurve | ECDSAP256SignAndVerify.java:33:47:33:80 | Key |
-| ECDSAP256SignAndVerify.java:33:47:33:80 | KeyGeneration | ECDSAP256SignAndVerify.java:30:51:30:74 | KeyOperationAlgorithm | ECDSAP256SignAndVerify.java:33:47:33:80 | Key |
-| Ed448SignAndVerify.java:21:47:21:80 | KeyGeneration | Ed448SignAndVerify.java:19:54:19:80 | EllipticCurve | Ed448SignAndVerify.java:21:47:21:80 | Key |
+| ECDSAP256SignAndVerify.java:57:16:57:49 | KeyGeneration | ECDSAP256SignAndVerify.java:53:47:53:70 | KeyOperationAlgorithm | ECDSAP256SignAndVerify.java:57:16:57:49 | Key |
+| ECDSAP256SignAndVerify.java:80:16:80:49 | KeyGeneration | ECDSAP256SignAndVerify.java:76:47:76:70 | KeyOperationAlgorithm | ECDSAP256SignAndVerify.java:80:16:80:49 | Key |
+| ECDSAP256SignAndVerify.java:103:16:103:49 | KeyGeneration | ECDSAP256SignAndVerify.java:99:47:99:70 | KeyOperationAlgorithm | ECDSAP256SignAndVerify.java:103:16:103:49 | Key |
 | Ed448SignAndVerify.java:21:47:21:80 | KeyGeneration | Ed448SignAndVerify.java:19:54:19:80 | KeyOperationAlgorithm | Ed448SignAndVerify.java:21:47:21:80 | Key |
-| Ed25519SignAndVerify.java:21:47:21:80 | KeyGeneration | Ed25519SignAndVerify.java:19:56:19:84 | EllipticCurve | Ed25519SignAndVerify.java:21:47:21:80 | Key |
 | Ed25519SignAndVerify.java:21:47:21:80 | KeyGeneration | Ed25519SignAndVerify.java:19:56:19:84 | KeyOperationAlgorithm | Ed25519SignAndVerify.java:21:47:21:80 | Key |
+| LMSSignature.java:33:47:33:74 | KeyGeneration | LMSSignature.java:31:46:31:70 | KeyOperationAlgorithm | LMSSignature.java:33:47:33:74 | Key |

java/ql/test/experimental/library-tests/quantum/BouncyCastle/signature_operations.expected

@@ -1,6 +1,9 @@
-| ECDSAP256SignAndVerify.java:45:48:45:80 | SignOperation | ECDSAP256SignAndVerify.java:41:34:41:50 | KeyOperationAlgorithm | ECDSAP256SignAndVerify.java:42:31:42:40 | Key | ECDSAP256SignAndVerify.java:45:73:45:79 | Message |  | SignatureOutput |
-| ECDSAP256SignAndVerify.java:54:32:54:92 | VerifyOperation | ECDSAP256SignAndVerify.java:52:36:52:52 | KeyOperationAlgorithm | ECDSAP256SignAndVerify.java:53:34:53:42 | Key | ECDSAP256SignAndVerify.java:54:57:54:63 | Message | SignatureInput |  |
+| ECDSAP256SignAndVerify.java:116:44:116:76 | SignOperation | ECDSAP256SignAndVerify.java:114:30:114:46 | KeyOperationAlgorithm | ECDSAP256SignAndVerify.java:115:27:115:36 | Key | ECDSAP256SignAndVerify.java:116:69:116:75 | Message |  | SignatureOutput |
+| ECDSAP256SignAndVerify.java:121:28:121:88 | VerifyOperation | ECDSAP256SignAndVerify.java:119:32:119:48 | KeyOperationAlgorithm | ECDSAP256SignAndVerify.java:120:30:120:38 | Key | ECDSAP256SignAndVerify.java:121:53:121:59 | Message | SignatureInput |  |
 | Ed448SignAndVerify.java:32:32:32:57 | SignOperation | Ed448SignAndVerify.java:29:34:29:70 | KeyOperationAlgorithm | Ed448SignAndVerify.java:30:31:30:40 | Key | Ed448SignAndVerify.java:31:27:31:33 | Message |  | SignatureOutput |
 | Ed448SignAndVerify.java:40:32:40:66 | VerifyOperation | Ed448SignAndVerify.java:37:36:37:72 | KeyOperationAlgorithm | Ed448SignAndVerify.java:38:34:38:42 | Key | Ed448SignAndVerify.java:39:29:39:35 | Message | SignatureInput |  |
 | Ed25519SignAndVerify.java:32:32:32:57 | SignOperation | Ed25519SignAndVerify.java:29:36:29:54 | KeyOperationAlgorithm | Ed25519SignAndVerify.java:30:31:30:40 | Key | Ed25519SignAndVerify.java:31:27:31:33 | Message |  | SignatureOutput |
 | Ed25519SignAndVerify.java:40:32:40:66 | VerifyOperation | Ed25519SignAndVerify.java:37:38:37:56 | KeyOperationAlgorithm | Ed25519SignAndVerify.java:38:34:38:42 | Key | Ed25519SignAndVerify.java:39:29:39:35 | Message | SignatureInput |  |
+| LMSSignature.java:44:32:44:64 | SignOperation | LMSSignature.java:40:32:40:46 | KeyOperationAlgorithm | LMSSignature.java:43:31:43:40 | Key | LMSSignature.java:44:57:44:63 | Message |  | SignatureOutput |
+| LMSSignature.java:51:32:51:73 | VerifyOperation | LMSSignature.java:40:32:40:46 | KeyOperationAlgorithm | LMSSignature.java:43:31:43:40 | Key | LMSSignature.java:51:55:51:61 | Message | SignatureInput |  |
+| LMSSignature.java:51:32:51:73 | VerifyOperation | LMSSignature.java:40:32:40:46 | KeyOperationAlgorithm | LMSSignature.java:50:32:50:40 | Key | LMSSignature.java:51:55:51:61 | Message | SignatureInput |  |