256 bit NTRU parameters

Author: dghgit

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

@@ -376,6 +376,8 @@ public interface BCObjectIdentifiers
     ASN1ObjectIdentifier ntruhps2048677 = pqc_kem_ntru.branch("2");
     ASN1ObjectIdentifier ntruhps4096821 = pqc_kem_ntru.branch("3");
     ASN1ObjectIdentifier ntruhrss701 = pqc_kem_ntru.branch("4");
+    ASN1ObjectIdentifier ntruhps40961229 = pqc_kem_ntru.branch("5");
+    ASN1ObjectIdentifier ntruhrss1373 = pqc_kem_ntru.branch("6");
 
     /**
      * Kyber

core/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUParameters.java

@@ -4,7 +4,9 @@
 import org.bouncycastle.pqc.crypto.KEMParameters;
 import org.bouncycastle.pqc.math.ntru.parameters.NTRUHPS2048509;
 import org.bouncycastle.pqc.math.ntru.parameters.NTRUHPS2048677;
+import org.bouncycastle.pqc.math.ntru.parameters.NTRUHPS40961229;
 import org.bouncycastle.pqc.math.ntru.parameters.NTRUHPS4096821;
+import org.bouncycastle.pqc.math.ntru.parameters.NTRUHRSS1373;
 import org.bouncycastle.pqc.math.ntru.parameters.NTRUHRSS701;
 import org.bouncycastle.pqc.math.ntru.parameters.NTRUParameterSet;
 
@@ -27,11 +29,22 @@ public class NTRUParameters
      */
     public static final NTRUParameters ntruhps4096821 = new NTRUParameters("ntruhps4096821", new NTRUHPS4096821());
 
+    /**
+     * NTRU-HPS parameter set with n = 1229 and q = 4096.
+     */
+    public static final NTRUParameters ntruhps40961229 = new NTRUParameters("ntruhps40961229", new NTRUHPS40961229());
+
     /**
      * NTRU-HRSS parameter set with n = 701.
      */
     public static final NTRUParameters ntruhrss701 = new NTRUParameters("ntruhrss701", new NTRUHRSS701());
 
+    /**
+     * NTRU-HRSS parameter set with n = 1373.
+     */
+    // TODO
+    // public static final NTRUParameters ntruhrss1373 = new NTRUParameters("ntruhrss1373", new NTRUHRSS1373());
+
     private final String name;
     /**
      * Currently selected parameter set

core/src/main/java/org/bouncycastle/pqc/crypto/util/PublicKeyFactory.java

@@ -188,7 +188,9 @@ public class PublicKeyFactory
         converters.put(BCObjectIdentifiers.ntruhps2048509, new NtruConverter());
         converters.put(BCObjectIdentifiers.ntruhps2048677, new NtruConverter());
         converters.put(BCObjectIdentifiers.ntruhps4096821, new NtruConverter());
+        converters.put(BCObjectIdentifiers.ntruhps40961229, new NtruConverter());
         converters.put(BCObjectIdentifiers.ntruhrss701, new NtruConverter());
+        converters.put(BCObjectIdentifiers.ntruhrss1373, new NtruConverter());
         converters.put(BCObjectIdentifiers.falcon_512, new FalconConverter());
         converters.put(BCObjectIdentifiers.falcon_1024, new FalconConverter());
         converters.put(BCObjectIdentifiers.kyber512, new KyberConverter());

core/src/main/java/org/bouncycastle/pqc/crypto/util/Utils.java

@@ -203,12 +203,16 @@ class Utils
         ntruOids.put(NTRUParameters.ntruhps2048509, BCObjectIdentifiers.ntruhps2048509);
         ntruOids.put(NTRUParameters.ntruhps2048677, BCObjectIdentifiers.ntruhps2048677);
         ntruOids.put(NTRUParameters.ntruhps4096821, BCObjectIdentifiers.ntruhps4096821);
+        ntruOids.put(NTRUParameters.ntruhps40961229, BCObjectIdentifiers.ntruhps40961229);
         ntruOids.put(NTRUParameters.ntruhrss701, BCObjectIdentifiers.ntruhrss701);
+//        ntruOids.put(NTRUParameters.ntruhrss1373, BCObjectIdentifiers.ntruhrss1373);
 
         ntruParams.put(BCObjectIdentifiers.ntruhps2048509, NTRUParameters.ntruhps2048509);
         ntruParams.put(BCObjectIdentifiers.ntruhps2048677, NTRUParameters.ntruhps2048677);
         ntruParams.put(BCObjectIdentifiers.ntruhps4096821, NTRUParameters.ntruhps4096821);
+        ntruParams.put(BCObjectIdentifiers.ntruhps40961229, NTRUParameters.ntruhps40961229);
         ntruParams.put(BCObjectIdentifiers.ntruhrss701, NTRUParameters.ntruhrss701);
+//        ntruParams.put(BCObjectIdentifiers.ntruhrss1373, NTRUParameters.ntruhrss1373);
 
         falconOids.put(FalconParameters.falcon_512, BCObjectIdentifiers.falcon_512);
         falconOids.put(FalconParameters.falcon_1024, BCObjectIdentifiers.falcon_1024);

core/src/main/java/org/bouncycastle/pqc/math/ntru/parameters/NTRUHPS40961229.java

@@ -0,0 +1,30 @@
+package org.bouncycastle.pqc.math.ntru.parameters;
+
+import org.bouncycastle.pqc.math.ntru.HPS4096Polynomial;
+import org.bouncycastle.pqc.math.ntru.Polynomial;
+
+/**
+ * NTRU-HPS parameter set with n = 1229 and q = 4096.
+ *
+ * @see NTRUHPSParameterSet
+ */
+public class NTRUHPS40961229
+    extends NTRUHPSParameterSet
+{
+    public NTRUHPS40961229()
+    {
+        super(
+            1229,
+            12,
+            32,
+            32,
+            32 // Category 5 (local model)
+        );
+    }
+
+    @Override
+    public Polynomial createPolynomial()
+    {
+        return new HPS4096Polynomial(this);
+    }
+}

core/src/main/java/org/bouncycastle/pqc/math/ntru/parameters/NTRUHRSS1373.java

@@ -0,0 +1,22 @@
+package org.bouncycastle.pqc.math.ntru.parameters;
+
+
+/**
+ * NTRU-HRSS parameter set with n = 701.
+ *
+ * @see NTRUHRSSParameterSet
+ */
+public class NTRUHRSS1373
+    extends NTRUHRSSParameterSet
+{
+    public NTRUHRSS1373()
+    {
+        super(
+            1373,
+            14,
+            32,
+            32,
+            32 // Category 5 (local model) - KATs based on 256 bit
+        );
+    }
+}

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

@@ -14,8 +14,10 @@ public void testParameters()
         assertEquals(256, NTRUParameters.ntruhps2048509.getSessionKeySize());
         assertEquals(256, NTRUParameters.ntruhps2048677.getSessionKeySize());
         assertEquals(256, NTRUParameters.ntruhps4096821.getSessionKeySize());
+        assertEquals(256, NTRUParameters.ntruhps40961229.getSessionKeySize());
 
         assertEquals(256, NTRUParameters.ntruhrss701.getSessionKeySize());
+//        assertEquals(256, NTRUParameters.ntruhrss1373.getSessionKeySize());
     }
 
     public void testHpsParameters()

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

@@ -36,19 +36,27 @@ public class NTRUTest
         NTRUParameters.ntruhps2048509,
         NTRUParameters.ntruhps2048677,
         NTRUParameters.ntruhps4096821,
-        NTRUParameters.ntruhrss701
+        NTRUParameters.ntruhps40961229,
+        NTRUParameters.ntruhrss701,
+//        NTRUParameters.ntruhrss1373
     };
+
     private final String[] katBase = {
         "ntruhps2048509",
         "ntruhps2048677",
         "ntruhps4096821",
-        "ntruhrss701"
+        "ntruhps40961229",
+        "ntruhrss701",
+//        "ntruhrss1373"
     };
+
     private final String[] katFiles = {
         "PQCkemKAT_935.rsp",
         "PQCkemKAT_1234.rsp",
         "PQCkemKAT_1590.rsp",
-        "PQCkemKAT_1450.rsp"
+        "PQCkemKAT_2366.rsp",
+        "PQCkemKAT_1450.rsp",
+        "PQCkemKAT_2983.rsp"
     };
 
     public void testPrivInfoGeneration()
@@ -76,6 +84,7 @@ public void testPQCgenKAT_kem()
         for (int i = 0; i < this.params.length; i++)
         {
             NTRUParameters param = params[i];
+
             InputStream src = TestResourceFinder.findTestResource("pqc/crypto/ntru/" + katBase[i], katFiles[i]);
             List<NTRUKAT> kats = NTRUKAT.getKAT(src);
 

prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/ntru/NTRUKeyPairGeneratorSpi.java

@@ -28,7 +28,9 @@ public class NTRUKeyPairGeneratorSpi
         parameters.put(NTRUParameterSpec.ntruhps2048509.getName(), NTRUParameters.ntruhps2048509);
         parameters.put(NTRUParameterSpec.ntruhps2048677.getName(), NTRUParameters.ntruhps2048677);
         parameters.put(NTRUParameterSpec.ntruhps4096821.getName(), NTRUParameters.ntruhps4096821);
+        parameters.put(NTRUParameterSpec.ntruhps40961229.getName(), NTRUParameters.ntruhps40961229);
         parameters.put(NTRUParameterSpec.ntruhrss701.getName(), NTRUParameters.ntruhrss701);
+//        parameters.put(NTRUParameterSpec.ntruhrss1373.getName(), NTRUParameters.ntruhrss1373);
     }
 
     NTRUKeyGenerationParameters param;

prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/NTRUParameterSpec.java

@@ -13,7 +13,9 @@ public class NTRUParameterSpec
     public static final NTRUParameterSpec ntruhps2048509 = new NTRUParameterSpec(NTRUParameters.ntruhps2048509);
     public static final NTRUParameterSpec ntruhps2048677 = new NTRUParameterSpec(NTRUParameters.ntruhps2048677);
     public static final NTRUParameterSpec ntruhps4096821 = new NTRUParameterSpec(NTRUParameters.ntruhps4096821);
+    public static final NTRUParameterSpec ntruhps40961229 = new NTRUParameterSpec(NTRUParameters.ntruhps40961229);
     public static final NTRUParameterSpec ntruhrss701 = new NTRUParameterSpec(NTRUParameters.ntruhrss701);
+//    public static final NTRUParameterSpec ntruhrss1373 = new NTRUParameterSpec(NTRUParameters.ntruhrss1373);
 
     private static Map parameters = new HashMap();
 

prov/src/test/java/org/bouncycastle/pqc/jcajce/provider/test/NTRUKeyPairGeneratorTest.java

@@ -40,7 +40,9 @@ public void testKeyPairEncoding()
                     NTRUParameterSpec.ntruhps2048509,
                     NTRUParameterSpec.ntruhps2048677,
                     NTRUParameterSpec.ntruhps4096821,
-                    NTRUParameterSpec.ntruhrss701
+                    NTRUParameterSpec.ntruhps40961229,
+                    NTRUParameterSpec.ntruhrss701,
+//                    NTRUParameterSpec.ntruhrss1373
                 };
         kf = KeyFactory.getInstance("NTRU", "BC");