deprecated mispelt field, added correct one. Relates to github #2158

Author: dghgit

core/src/main/java/org/bouncycastle/crypto/hpke/DHKEM.java

@@ -73,7 +73,7 @@ protected DHKEM(short kemid)
             this.kpGen.init(new ECKeyGenerationParameters(domainParams, getSecureRandom()));
 
             break;
-        case HPKE.kem_P384_SHA348:
+        case HPKE.kem_P384_SHA384:
             this.hkdf = new HKDF(HPKE.kdf_HKDF_SHA384);
             domainParams = getDomainParameters("P-384");
             rawAgreement = new BasicRawAgreement(new ECDHCBasicAgreement());
@@ -131,7 +131,7 @@ public byte[] SerializePublicKey(AsymmetricKeyParameter key)
         switch (kemId)
         {
         case HPKE.kem_P256_SHA256:
-        case HPKE.kem_P384_SHA348:
+        case HPKE.kem_P384_SHA384:
         case HPKE.kem_P521_SHA512:
             /*
              * RFC 9180 7.1.1. For P-256, P-384, and P-521, the SerializePublicKey() function of the KEM performs
@@ -152,7 +152,7 @@ public byte[] SerializePrivateKey(AsymmetricKeyParameter key)
         switch (kemId)
         {
         case HPKE.kem_P256_SHA256:
-        case HPKE.kem_P384_SHA348:
+        case HPKE.kem_P384_SHA384:
         case HPKE.kem_P521_SHA512:
         {
             /*
@@ -205,7 +205,7 @@ public AsymmetricKeyParameter DeserializePublicKey(byte[] pkEncoded)
         switch (kemId)
         {
         case HPKE.kem_P256_SHA256:
-        case HPKE.kem_P384_SHA348:
+        case HPKE.kem_P384_SHA384:
         case HPKE.kem_P521_SHA512:
             /*
              * RFC 9180 7.1.1. For P-256, P-384, and P-521 [..]. DeserializePublicKey() performs the
@@ -248,7 +248,7 @@ public AsymmetricCipherKeyPair DeserializePrivateKey(byte[] skEncoded, byte[] pk
         switch (kemId)
         {
         case HPKE.kem_P256_SHA256:
-        case HPKE.kem_P384_SHA348:
+        case HPKE.kem_P384_SHA384:
         case HPKE.kem_P521_SHA512:
             /*
              * RFC 9180 7.1.2. For P-256, P-384, and P-521 [..]. DeserializePrivateKey() performs the Octet-
@@ -321,7 +321,7 @@ public AsymmetricCipherKeyPair DeriveKeyPair(byte[] ikm)
         switch (kemId)
         {
         case HPKE.kem_P256_SHA256:
-        case HPKE.kem_P384_SHA348:
+        case HPKE.kem_P384_SHA384:
         case HPKE.kem_P521_SHA512:
         {
             byte[] dkp_prk = hkdf.LabeledExtract(null, suiteID, "dkp_prk", ikm);

mls/src/main/java/org/bouncycastle/mls/crypto/MlsCipherSuite.java

@@ -78,7 +78,7 @@ public void writeTo(MLSOutputStream stream)
     public static final MlsCipherSuite BCMLS_256_DHKEMX448_AES256GCM_SHA512_Ed448 = new MlsCipherSuite(MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448, new BcMlsSigner(MlsSigner.ed448), new BcMlsKdf(new SHA512Digest()), new BcMlsAead(HPKE.aead_AES_GCM256), new HPKE(HPKE.mode_base, HPKE.kem_X448_SHA512, HPKE.kdf_HKDF_SHA512, HPKE.aead_AES_GCM256));
     public static final MlsCipherSuite BCMLS_256_DHKEMP521_AES256GCM_SHA512_P521 = new MlsCipherSuite(MLS_256_DHKEMP521_AES256GCM_SHA512_P521, new BcMlsSigner(MlsSigner.ecdsa_secp521r1_sha512), new BcMlsKdf(new SHA512Digest()), new BcMlsAead(HPKE.aead_AES_GCM256), new HPKE(HPKE.mode_base, HPKE.kem_P521_SHA512, HPKE.kdf_HKDF_SHA512, HPKE.aead_AES_GCM256));
     public static final MlsCipherSuite BCMLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448 = new MlsCipherSuite(MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448, new BcMlsSigner(MlsSigner.ed448), new BcMlsKdf(new SHA512Digest()), new BcMlsAead(HPKE.aead_CHACHA20_POLY1305), new HPKE(HPKE.mode_base, HPKE.kem_X448_SHA512, HPKE.kdf_HKDF_SHA512, HPKE.aead_CHACHA20_POLY1305));
-    public static final MlsCipherSuite BCMLS_256_DHKEMP384_AES256GCM_SHA384_P384 = new MlsCipherSuite(MLS_256_DHKEMP384_AES256GCM_SHA384_P384, new BcMlsSigner(MlsSigner.ecdsa_secp384r1_sha384), new BcMlsKdf(new SHA384Digest()), new BcMlsAead(HPKE.aead_AES_GCM256), new HPKE(HPKE.mode_base, HPKE.kem_P384_SHA348, HPKE.kdf_HKDF_SHA384, HPKE.aead_AES_GCM256));
+    public static final MlsCipherSuite BCMLS_256_DHKEMP384_AES256GCM_SHA384_P384 = new MlsCipherSuite(MLS_256_DHKEMP384_AES256GCM_SHA384_P384, new BcMlsSigner(MlsSigner.ecdsa_secp384r1_sha384), new BcMlsKdf(new SHA384Digest()), new BcMlsAead(HPKE.aead_AES_GCM256), new HPKE(HPKE.mode_base, HPKE.kem_P384_SHA384, HPKE.kdf_HKDF_SHA384, HPKE.aead_AES_GCM256));
 
     public static final short[] ALL_SUPPORTED_SUITES = {
         MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519,

mls/src/test/java/org/bouncycastle/mls/test/MessageProtectionTest.java

@@ -178,7 +178,7 @@ private MlsCipherSuite createNewSuite(short id)
                 return new MlsCipherSuite(MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448, new BcMlsSigner(MlsSigner.ed448), new BcMlsKdf(new SHA512Digest()), new BcMlsAead(HPKE.aead_CHACHA20_POLY1305), new HPKE(HPKE.mode_base, HPKE.kem_X448_SHA512, HPKE.kdf_HKDF_SHA512, HPKE.aead_CHACHA20_POLY1305));
 
             case MLS_256_DHKEMP384_AES256GCM_SHA384_P384:
-                return new MlsCipherSuite(MLS_256_DHKEMP384_AES256GCM_SHA384_P384, new BcMlsSigner(MlsSigner.ecdsa_secp384r1_sha384), new BcMlsKdf(new SHA384Digest()), new BcMlsAead(HPKE.aead_AES_GCM256), new HPKE(HPKE.mode_base, HPKE.kem_P384_SHA348, HPKE.kdf_HKDF_SHA384, HPKE.aead_AES_GCM256));
+                return new MlsCipherSuite(MLS_256_DHKEMP384_AES256GCM_SHA384_P384, new BcMlsSigner(MlsSigner.ecdsa_secp384r1_sha384), new BcMlsKdf(new SHA384Digest()), new BcMlsAead(HPKE.aead_AES_GCM256), new HPKE(HPKE.mode_base, HPKE.kem_P384_SHA384, HPKE.kdf_HKDF_SHA384, HPKE.aead_AES_GCM256));
 
         }
         return null;