added LMSTest, HSSTest, added support for use of 1 level HSS keys in LMSSigner

Author: dghgit

core/src/main/java/org/bouncycastle/pqc/crypto/lms/LMSSigner.java

@@ -15,11 +15,41 @@ public void init(boolean forSigning, CipherParameters param)
     {
          if (forSigning)
          {
-             privKey = (LMSPrivateKeyParameters)param;
+             if (param instanceof HSSPrivateKeyParameters)
+             {
+                 HSSPrivateKeyParameters hssPriv = (HSSPrivateKeyParameters)param;
+                 if (hssPriv.getL() == 1)
+                 {
+                     privKey = hssPriv.getRootKey();
+                 }
+                 else
+                 {
+                     throw new IllegalArgumentException("only a single level HSS key can be used with LMS");
+                 }
+             }
+             else
+             {
+                 privKey = (LMSPrivateKeyParameters)param;
+             }
          }
          else
          {
-             pubKey = (LMSPublicKeyParameters)param;
+             if (param instanceof HSSPublicKeyParameters)
+             {
+                 HSSPublicKeyParameters hssPub = (HSSPublicKeyParameters)param;
+                 if (hssPub.getL() == 1)
+                 {
+                     pubKey = hssPub.getLMSPublicKey();
+                 }
+                 else
+                 {
+                     throw new IllegalArgumentException("only a single level HSS key can be used with LMS");
+                 }
+             }
+             else
+             {
+                 pubKey = (LMSPublicKeyParameters)param;
+             }
          }
     }
 

core/src/test/java/org/bouncycastle/pqc/crypto/test/AllTests.java

@@ -19,6 +19,8 @@ public static Test suite()
     {
         TestSuite suite = new TestSuite("Lightweight PQ Crypto Tests");
 
+        suite.addTestSuite(LMSTest.class);
+        suite.addTestSuite(HSSTest.class);
         suite.addTestSuite(XMSSMTPrivateKeyTest.class);
         suite.addTestSuite(XMSSMTPublicKeyTest.class);
         suite.addTestSuite(XMSSMTSignatureTest.class);

core/src/test/java/org/bouncycastle/pqc/crypto/test/LMSTest.java

@@ -8,6 +8,7 @@
 import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
 import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
 import org.bouncycastle.pqc.crypto.ExhaustedPrivateKeyException;
+import org.bouncycastle.pqc.crypto.lms.HSSPrivateKeyParameters;
 import org.bouncycastle.pqc.crypto.lms.LMOtsParameters;
 import org.bouncycastle.pqc.crypto.lms.LMSKeyGenerationParameters;
 import org.bouncycastle.pqc.crypto.lms.LMSKeyPairGenerator;
@@ -158,7 +159,7 @@ public void testKeyGenAndSignTwoSigsWithShard()
         PrivateKeyInfo pInfo = PrivateKeyInfoFactory.createPrivateKeyInfo(kp.getPrivate());
         AsymmetricKeyParameter pKey = PrivateKeyFactory.createKey(pInfo.getEncoded());
 
-        signer.init(false, ((LMSPrivateKeyParameters)pKey).getPublicKey());
+        signer.init(false, ((HSSPrivateKeyParameters)pKey).getPublicKey());
 
         assertTrue(signer.verifySignature(msg1, sig1));
     }