Added SPHINCS sig params.

Author: dghgit

core/src/main/java/org/bouncycastle/asn1/bc/BCObjectIdentifiers.java

@@ -76,7 +76,7 @@ public interface BCObjectIdentifiers
      * Sphincs-256
      */
     public static final ASN1ObjectIdentifier sphincs256                      = bc_sig.branch("1");
-    public static final ASN1ObjectIdentifier sphincs256_Blake512_Blake256    = sphincs256.branch("1");
-    public static final ASN1ObjectIdentifier sphincs256_Sha512_Sha512_256    = sphincs256.branch("2");
-    public static final ASN1ObjectIdentifier sphincs256_Sha3_512_Sha3_256    = sphincs256.branch("3");
+    public static final ASN1ObjectIdentifier sphincs256_with_BLAKE512        = sphincs256.branch("1");
+    public static final ASN1ObjectIdentifier sphincs256_with_SHA512          = sphincs256.branch("2");
+    public static final ASN1ObjectIdentifier sphincs256_with_SHA3_512        = sphincs256.branch("3");
 }

core/src/main/java/org/bouncycastle/pqc/asn1/PQCObjectIdentifiers.java

@@ -44,8 +44,8 @@ public interface PQCObjectIdentifiers
     /** 1.3.6.1.4.1.8301.3.1.3.4.2 */
     public static final ASN1ObjectIdentifier mcElieceCca2   = new ASN1ObjectIdentifier("1.3.6.1.4.1.8301.3.1.3.4.2");
 
-    public static final ASN1ObjectIdentifier sphincs256                      = BCObjectIdentifiers.sphincs256;
-    public static final ASN1ObjectIdentifier sphincs256_Blake512_Blake256    = BCObjectIdentifiers.sphincs256_Blake512_Blake256;
-    public static final ASN1ObjectIdentifier sphincs256_Sha512_Sha512_256    = BCObjectIdentifiers.sphincs256_Sha512_Sha512_256;
-    public static final ASN1ObjectIdentifier sphincs256_Sha3_512_Sha3_256    = BCObjectIdentifiers.sphincs256_Sha3_512_Sha3_256;
+    public static final ASN1ObjectIdentifier sphincs256 = BCObjectIdentifiers.sphincs256;
+    public static final ASN1ObjectIdentifier sphincs256_with_BLAKE512 = BCObjectIdentifiers.sphincs256_with_BLAKE512;
+    public static final ASN1ObjectIdentifier sphincs256_with_SHA512 = BCObjectIdentifiers.sphincs256_with_SHA512;
+    public static final ASN1ObjectIdentifier sphincs256_with_SHA3_512 = BCObjectIdentifiers.sphincs256_with_SHA3_512;
 }

core/src/main/java/org/bouncycastle/pqc/asn1/SPHINCS256SigParams.java

@@ -0,0 +1,59 @@
+package org.bouncycastle.pqc.asn1;
+
+import org.bouncycastle.asn1.ASN1EncodableVector;
+import org.bouncycastle.asn1.ASN1Integer;
+import org.bouncycastle.asn1.ASN1Object;
+import org.bouncycastle.asn1.ASN1Primitive;
+import org.bouncycastle.asn1.ASN1Sequence;
+import org.bouncycastle.asn1.DERSequence;
+
+/**
+ * Used to mark signatures with the correct key details.
+ */
+public class SPHINCS256SigParams
+    extends ASN1Object
+{
+    private final ASN1Integer version;
+    private final SPHINCS256KeyParams keyParams;
+
+    public SPHINCS256SigParams(SPHINCS256KeyParams keyParams)
+    {
+        this.version = new ASN1Integer(0);
+        this.keyParams = keyParams;
+    }
+
+    private SPHINCS256SigParams(ASN1Sequence sequence)
+    {
+        this.version = ASN1Integer.getInstance(sequence.getObjectAt(0));
+        this.keyParams = SPHINCS256KeyParams.getInstance(sequence.getObjectAt(1));
+    }
+
+    public static final SPHINCS256SigParams getInstance(Object o)
+    {
+        if (o instanceof SPHINCS256SigParams)
+        {
+            return (SPHINCS256SigParams)o;
+        }
+        else if (o != null)
+        {
+            return new SPHINCS256SigParams(ASN1Sequence.getInstance(o));
+        }
+
+        return null;
+    }
+
+    public SPHINCS256KeyParams getKeyParams()
+    {
+        return keyParams;
+    }
+
+    public ASN1Primitive toASN1Primitive()
+    {
+        ASN1EncodableVector v = new ASN1EncodableVector();
+
+        v.add(version);
+        v.add(keyParams);
+
+        return new DERSequence(v);
+    }
+}

prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/SPHINCS.java

@@ -22,8 +22,8 @@ public void configure(ConfigurableProvider provider)
             provider.addAlgorithm("KeyFactory.SPHINCS256", PREFIX + "Sphincs256KeyFactorySpi");
             provider.addAlgorithm("KeyPairGenerator.SPHINCS256", PREFIX + "Sphincs256KeyPairGeneratorSpi");
 
-            addSignatureAlgorithm(provider, "SHA512", "SPHINCS256", PREFIX + "SignatureSpi$withSha512", PQCObjectIdentifiers.sphincs256_Sha512_Sha512_256);
-            addSignatureAlgorithm(provider, "SHA3-512", "SPHINCS256", PREFIX + "SignatureSpi$withSha3_512", PQCObjectIdentifiers.sphincs256_Sha3_512_Sha3_256);
+            addSignatureAlgorithm(provider, "SHA512", "SPHINCS256", PREFIX + "SignatureSpi$withSha512", PQCObjectIdentifiers.sphincs256_with_SHA512);
+            addSignatureAlgorithm(provider, "SHA3-512", "SPHINCS256", PREFIX + "SignatureSpi$withSha3_512", PQCObjectIdentifiers.sphincs256_with_SHA3_512);
 
             AsymmetricKeyInfoConverter keyFact = new Sphincs256KeyFactorySpi();