added key encoding/decoding JCA support for Kyber-AES

Author: royb

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

@@ -341,7 +341,10 @@ public interface BCObjectIdentifiers
     ASN1ObjectIdentifier kyber512 = pqc_kem_kyber.branch("1");
     ASN1ObjectIdentifier kyber768 = pqc_kem_kyber.branch("2");
     ASN1ObjectIdentifier kyber1024 = pqc_kem_kyber.branch("3");
-    
+    ASN1ObjectIdentifier kyber512_aes = pqc_kem_kyber.branch("4");
+    ASN1ObjectIdentifier kyber768_aes = pqc_kem_kyber.branch("5");
+    ASN1ObjectIdentifier kyber1024_aes = pqc_kem_kyber.branch("6");
+
     /**
      * NTRUPrime
      */

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

@@ -144,6 +144,9 @@ public class PublicKeyFactory
         converters.put(BCObjectIdentifiers.kyber512, new KyberConverter());
         converters.put(BCObjectIdentifiers.kyber768, new KyberConverter());
         converters.put(BCObjectIdentifiers.kyber1024, new KyberConverter());
+        converters.put(BCObjectIdentifiers.kyber512_aes, new KyberConverter());
+        converters.put(BCObjectIdentifiers.kyber768_aes, new KyberConverter());
+        converters.put(BCObjectIdentifiers.kyber1024_aes, new KyberConverter());
         converters.put(BCObjectIdentifiers.ntrulpr653, new NTRULPrimeConverter());
         converters.put(BCObjectIdentifiers.ntrulpr761, new NTRULPrimeConverter());
         converters.put(BCObjectIdentifiers.ntrulpr857, new NTRULPrimeConverter());

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

@@ -218,10 +218,16 @@ class Utils
         kyberOids.put(KyberParameters.kyber512, BCObjectIdentifiers.kyber512);
         kyberOids.put(KyberParameters.kyber768, BCObjectIdentifiers.kyber768);
         kyberOids.put(KyberParameters.kyber1024, BCObjectIdentifiers.kyber1024);
+        kyberOids.put(KyberParameters.kyber512_aes, BCObjectIdentifiers.kyber512_aes);
+        kyberOids.put(KyberParameters.kyber768_aes, BCObjectIdentifiers.kyber768_aes);
+        kyberOids.put(KyberParameters.kyber1024_aes, BCObjectIdentifiers.kyber1024_aes);
 
         kyberParams.put(BCObjectIdentifiers.kyber512, KyberParameters.kyber512);
         kyberParams.put(BCObjectIdentifiers.kyber768, KyberParameters.kyber768);
         kyberParams.put(BCObjectIdentifiers.kyber1024, KyberParameters.kyber1024);
+        kyberParams.put(BCObjectIdentifiers.kyber512_aes, KyberParameters.kyber512_aes);
+        kyberParams.put(BCObjectIdentifiers.kyber768_aes, KyberParameters.kyber768_aes);
+        kyberParams.put(BCObjectIdentifiers.kyber1024_aes, KyberParameters.kyber1024_aes);
 
         ntruprimeOids.put(NTRULPRimeParameters.ntrulpr653, BCObjectIdentifiers.ntrulpr653);
         ntruprimeOids.put(NTRULPRimeParameters.ntrulpr761, BCObjectIdentifiers.ntrulpr761);

prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/kyber/KyberKeyPairGeneratorSpi.java

@@ -28,6 +28,9 @@ public class KyberKeyPairGeneratorSpi
         parameters.put(KyberParameterSpec.kyber512.getName(), KyberParameters.kyber512);
         parameters.put(KyberParameterSpec.kyber768.getName(), KyberParameters.kyber768);
         parameters.put(KyberParameterSpec.kyber1024.getName(), KyberParameters.kyber1024);
+        parameters.put(KyberParameterSpec.kyber512_aes.getName(), KyberParameters.kyber512_aes);
+        parameters.put(KyberParameterSpec.kyber768_aes.getName(), KyberParameters.kyber768_aes);
+        parameters.put(KyberParameterSpec.kyber1024_aes.getName(), KyberParameters.kyber1024_aes);
     }
 
     KyberKeyGenerationParameters param;

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

@@ -13,6 +13,9 @@ public class KyberParameterSpec
     public static final KyberParameterSpec kyber512 = new KyberParameterSpec(KyberParameters.kyber512);
     public static final KyberParameterSpec kyber768 = new KyberParameterSpec(KyberParameters.kyber768);
     public static final KyberParameterSpec kyber1024 = new KyberParameterSpec(KyberParameters.kyber1024);
+    public static final KyberParameterSpec kyber512_aes = new KyberParameterSpec(KyberParameters.kyber512_aes);
+    public static final KyberParameterSpec kyber768_aes = new KyberParameterSpec(KyberParameters.kyber768_aes);
+    public static final KyberParameterSpec kyber1024_aes = new KyberParameterSpec(KyberParameters.kyber1024_aes);
 
     private static Map parameters = new HashMap();
 
@@ -21,6 +24,9 @@ public class KyberParameterSpec
         parameters.put("kyber512", kyber512);
         parameters.put("kyber768", kyber768);
         parameters.put("kyber1024", kyber1024);
+        parameters.put("kyber512-aes", kyber512_aes);
+        parameters.put("kyber768-aes", kyber768_aes);
+        parameters.put("kyber1024-aes", kyber1024_aes);
     }
 
     private final String name;

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

@@ -35,7 +35,10 @@ public void testKeyPairEncoding()
                 {
                         KyberParameterSpec.kyber512,
                         KyberParameterSpec.kyber768,
-                        KyberParameterSpec.kyber1024
+                        KyberParameterSpec.kyber1024,
+                        KyberParameterSpec.kyber512_aes,
+                        KyberParameterSpec.kyber768_aes,
+                        KyberParameterSpec.kyber1024_aes
                 };
         kf = KeyFactory.getInstance("Kyber", "BCPQC");