From 0a1854d2f669669a1a375afbc15f1858a885af06 Mon Sep 17 00:00:00 2001 From: David Hook Date: Mon, 14 Aug 2023 13:57:40 +1000 Subject: removed AES parameters from Dilithium --- crypto/src/pqc/crypto/crystals/dilithium/DilithiumEngine.cs | 2 +- crypto/src/pqc/crypto/crystals/dilithium/DilithiumParameters.cs | 5 ----- crypto/src/pqc/crypto/utils/PqcUtilities.cs | 6 ------ 3 files changed, 1 insertion(+), 12 deletions(-) (limited to 'crypto/src') diff --git a/crypto/src/pqc/crypto/crystals/dilithium/DilithiumEngine.cs b/crypto/src/pqc/crypto/crystals/dilithium/DilithiumEngine.cs index 27f1a59cd..b03da9748 100644 --- a/crypto/src/pqc/crypto/crystals/dilithium/DilithiumEngine.cs +++ b/crypto/src/pqc/crypto/crystals/dilithium/DilithiumEngine.cs @@ -203,7 +203,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Crystals.Dilithium } byte[] KeyMu = Arrays.CopyOf(key, SeedBytes + RndBytes + CrhBytes); - Array.Copy(mu, 0, KeyMu, SeedBytes, RndBytes); + Array.Copy(rnd, 0, KeyMu, SeedBytes, RndBytes); Array.Copy(mu, 0, KeyMu, SeedBytes + RndBytes, CrhBytes); ShakeDigest256.BlockUpdate(KeyMu, 0, SeedBytes + RndBytes + CrhBytes); ShakeDigest256.OutputFinal(rhoPrime, 0, CrhBytes); diff --git a/crypto/src/pqc/crypto/crystals/dilithium/DilithiumParameters.cs b/crypto/src/pqc/crypto/crystals/dilithium/DilithiumParameters.cs index e6aa6ab21..05c52c0c9 100644 --- a/crypto/src/pqc/crypto/crystals/dilithium/DilithiumParameters.cs +++ b/crypto/src/pqc/crypto/crystals/dilithium/DilithiumParameters.cs @@ -7,13 +7,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Crystals.Dilithium : ICipherParameters { public static DilithiumParameters Dilithium2 = new DilithiumParameters(2, false); - public static DilithiumParameters Dilithium2Aes = new DilithiumParameters(2, true); - public static DilithiumParameters Dilithium3 = new DilithiumParameters(3, false); - public static DilithiumParameters Dilithium3Aes = new DilithiumParameters(3, true); - public static DilithiumParameters Dilithium5 = new DilithiumParameters(5, false); - public static DilithiumParameters Dilithium5Aes = new DilithiumParameters(5, true); private int k; private bool usingAes; diff --git a/crypto/src/pqc/crypto/utils/PqcUtilities.cs b/crypto/src/pqc/crypto/utils/PqcUtilities.cs index 9174dd71b..9f9f3381a 100644 --- a/crypto/src/pqc/crypto/utils/PqcUtilities.cs +++ b/crypto/src/pqc/crypto/utils/PqcUtilities.cs @@ -201,16 +201,10 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities dilithiumOids[DilithiumParameters.Dilithium2] = BCObjectIdentifiers.dilithium2; dilithiumOids[DilithiumParameters.Dilithium3] = BCObjectIdentifiers.dilithium3; dilithiumOids[DilithiumParameters.Dilithium5] = BCObjectIdentifiers.dilithium5; - dilithiumOids[DilithiumParameters.Dilithium2Aes] = BCObjectIdentifiers.dilithium2_aes; - dilithiumOids[DilithiumParameters.Dilithium3Aes] = BCObjectIdentifiers.dilithium3_aes; - dilithiumOids[DilithiumParameters.Dilithium5Aes] = BCObjectIdentifiers.dilithium5_aes; dilithiumParams[BCObjectIdentifiers.dilithium2] = DilithiumParameters.Dilithium2; dilithiumParams[BCObjectIdentifiers.dilithium3] = DilithiumParameters.Dilithium3; dilithiumParams[BCObjectIdentifiers.dilithium5] = DilithiumParameters.Dilithium5; - dilithiumParams[BCObjectIdentifiers.dilithium2_aes] = DilithiumParameters.Dilithium2Aes; - dilithiumParams[BCObjectIdentifiers.dilithium3_aes] = DilithiumParameters.Dilithium3Aes; - dilithiumParams[BCObjectIdentifiers.dilithium5_aes] = DilithiumParameters.Dilithium5Aes; bikeParams[BCObjectIdentifiers.bike128] = BikeParameters.bike128; bikeParams[BCObjectIdentifiers.bike192] = BikeParameters.bike192; -- cgit 1.5.1