Skip to content

BCrypt Composite ML-DSA #129612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PranavSenthilnathan wants to merge 5 commits into
base: main
Choose a base branch
from
Open

BCrypt Composite ML-DSA #129612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7063c5
BCrypt Composite ML-DSA
PranavSenthilnathan Jun 19, 2026
30f5a41
add assert
PranavSenthilnathan Jun 24, 2026
b1c9b6a
M.BCL.Crypto doesn't need managed Composite ML-DSA
PranavSenthilnathan Jun 24, 2026
c62670f
address feeback
PranavSenthilnathan Jun 25, 2026
cde7fe2
PR feedback
PranavSenthilnathan Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions src/libraries/Common/src/Interop/Windows/BCrypt/Cng.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,26 @@ internal static partial class BCryptNative
/// </summary>
internal static class AlgorithmName
{
public const string DSA = "DSA"; // BCRYPT_DSA_ALGORITHM
public const string ECDH = "ECDH"; // BCRYPT_ECDH_ALGORITHM
public const string ECDHP256 = "ECDH_P256"; // BCRYPT_ECDH_P256_ALGORITHM
public const string ECDHP384 = "ECDH_P384"; // BCRYPT_ECDH_P384_ALGORITHM
public const string ECDHP521 = "ECDH_P521"; // BCRYPT_ECDH_P521_ALGORITHM
public const string ECDsa = "ECDSA"; // BCRYPT_ECDSA_ALGORITHM
public const string ECDsaP256 = "ECDSA_P256"; // BCRYPT_ECDSA_P256_ALGORITHM
public const string ECDsaP384 = "ECDSA_P384"; // BCRYPT_ECDSA_P384_ALGORITHM
public const string ECDsaP521 = "ECDSA_P521"; // BCRYPT_ECDSA_P521_ALGORITHM
public const string HKDF = "HKDF"; // BCRYPT_HKDF_ALGORITHM
public const string MD5 = "MD5"; // BCRYPT_MD5_ALGORITHM
public const string MLDsa = "ML-DSA"; // BCRYPT_MLDSA_ALGORITHM
public const string MLKem = "ML-KEM"; // BCRYPT_MLKEM_ALGORITHM
public const string RSA = "RSA"; // BCRYPT_RSA_ALGORITHM
public const string Sha1 = "SHA1"; // BCRYPT_SHA1_ALGORITHM
public const string Sha256 = "SHA256"; // BCRYPT_SHA256_ALGORITHM
public const string Sha384 = "SHA384"; // BCRYPT_SHA384_ALGORITHM
public const string Sha512 = "SHA512"; // BCRYPT_SHA512_ALGORITHM
public const string Pbkdf2 = "PBKDF2"; // BCRYPT_PBKDF2_ALGORITHM
public const string CompositeMLDsa = "Composite-ML-DSA"; // BCRYPT_COMPOSITE_MLDSA_ALGORITHM
public const string DSA = "DSA"; // BCRYPT_DSA_ALGORITHM
public const string ECDH = "ECDH"; // BCRYPT_ECDH_ALGORITHM
public const string ECDHP256 = "ECDH_P256"; // BCRYPT_ECDH_P256_ALGORITHM
public const string ECDHP384 = "ECDH_P384"; // BCRYPT_ECDH_P384_ALGORITHM
public const string ECDHP521 = "ECDH_P521"; // BCRYPT_ECDH_P521_ALGORITHM
public const string ECDsa = "ECDSA"; // BCRYPT_ECDSA_ALGORITHM
public const string ECDsaP256 = "ECDSA_P256"; // BCRYPT_ECDSA_P256_ALGORITHM
public const string ECDsaP384 = "ECDSA_P384"; // BCRYPT_ECDSA_P384_ALGORITHM
public const string ECDsaP521 = "ECDSA_P521"; // BCRYPT_ECDSA_P521_ALGORITHM
public const string HKDF = "HKDF"; // BCRYPT_HKDF_ALGORITHM
public const string MD5 = "MD5"; // BCRYPT_MD5_ALGORITHM
public const string MLDsa = "ML-DSA"; // BCRYPT_MLDSA_ALGORITHM
public const string MLKem = "ML-KEM"; // BCRYPT_MLKEM_ALGORITHM
public const string RSA = "RSA"; // BCRYPT_RSA_ALGORITHM
public const string Sha1 = "SHA1"; // BCRYPT_SHA1_ALGORITHM
public const string Sha256 = "SHA256"; // BCRYPT_SHA256_ALGORITHM
public const string Sha384 = "SHA384"; // BCRYPT_SHA384_ALGORITHM
public const string Sha512 = "SHA512"; // BCRYPT_SHA512_ALGORITHM
public const string Pbkdf2 = "PBKDF2"; // BCRYPT_PBKDF2_ALGORITHM
}

internal static class KeyDerivationFunction
Expand Down
8 changes: 5 additions & 3 deletions src/libraries/Common/src/Interop/Windows/BCrypt/Interop.BCryptSignHash.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ internal static unsafe NTSTATUS BCryptSignHashPss(
}
}

internal static unsafe void BCryptSignHashPqcPure(
internal static unsafe int BCryptSignHashPqcPure(
SafeBCryptKeyHandle key,
ReadOnlySpan<byte> data,
ReadOnlySpan<byte> context,
Expand Down Expand Up @@ -104,12 +104,14 @@ internal static unsafe void BCryptSignHashPqcPure(
BCryptSignVerifyFlags.BCRYPT_PAD_PQDSA);
}

Debug.Assert(bytesWritten == destination.Length);

if (status != Interop.BCrypt.NTSTATUS.STATUS_SUCCESS)
{
throw Interop.BCrypt.CreateCryptographicException(status);
}

Debug.Assert(bytesWritten <= destination.Length);

return bytesWritten;
}

internal static unsafe void BCryptSignHashPqcPreHash(
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/Common/src/Interop/Windows/BCrypt/Interop.Blobs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ internal enum KeyBlobMagicNumber : int
BCRYPT_ECDSA_PUBLIC_GENERIC_MAGIC = 0x50444345,
BCRYPT_ECDSA_PRIVATE_GENERIC_MAGIC = 0x56444345,

BCRYPT_COMPOSITE_MLDSA_PUBLIC_MAGIC = 0x4B504D43,
BCRYPT_COMPOSITE_MLDSA_PRIVATE_MAGIC = 0x4B534D43,

BCRYPT_MLDSA_PUBLIC_MAGIC = 0x4B505344,
BCRYPT_MLDSA_PRIVATE_MAGIC = 0x4B535344,
BCRYPT_MLDSA_PRIVATE_SEED_MAGIC = 0x53535344,
Expand Down
54 changes: 54 additions & 0 deletions src/libraries/Common/src/System/Security/Cryptography/CompositeMLDsa.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,11 @@ static void SubjectPublicKeyReader(ReadOnlySpan<byte> key, in ValueAlgorithmIden
{
CompositeMLDsaAlgorithm algorithm = GetAlgorithmIdentifier(in identifier);

if (!IsAlgorithmSupported(algorithm))
{
throw new CryptographicException(SR.Format(SR.Cryptography_AlgorithmNotSupported, nameof(CompositeMLDsa)));
}

if (!algorithm.IsValidPublicKeySize(key.Length))
{
throw new CryptographicException(SR.Argument_PublicKeyWrongSizeForAlgorithm);
Expand Down Expand Up @@ -867,6 +872,11 @@ static void PrivateKeyReader(
{
CompositeMLDsaAlgorithm algorithm = GetAlgorithmIdentifier(in algorithmIdentifier);

if (!IsAlgorithmSupported(algorithm))
{
throw new CryptographicException(SR.Format(SR.Cryptography_AlgorithmNotSupported, nameof(CompositeMLDsa)));
}

if (!algorithm.IsValidPrivateKeySize(privateKeyContents.Length))
{
throw new CryptographicException(SR.Argument_PrivateKeyWrongSizeForAlgorithm);
Expand Down Expand Up @@ -1795,6 +1805,50 @@ protected virtual void Dispose(bool disposing)
{
}

private protected bool TryExportPkcs8FromExportedPrivateKey(Span<byte> destination, out int bytesWritten)
{
AsnWriter? writer = null;

try
{
using (CryptoPoolLease lease = CryptoPoolLease.Rent(Algorithm.MaxPrivateKeySizeInBytes))
{
int privateKeySize = ExportCompositeMLDsaPrivateKeyCore(lease.Span);

if (!Algorithm.IsValidPrivateKeySize(privateKeySize))
{
bytesWritten = 0;
throw new CryptographicException(SR.Argument_PrivateKeyWrongSizeForAlgorithm);
}

// Add some overhead for the ASN.1 structure.
int initialCapacity = 32 + privateKeySize;

writer = new AsnWriter(AsnEncodingRules.DER, initialCapacity);

using (writer.PushSequence())
{
writer.WriteInteger(0); // Version

using (writer.PushSequence())
{
writer.WriteObjectIdentifier(Algorithm.Oid);
}

writer.WriteOctetString(lease.Span.Slice(0, privateKeySize));
}

Debug.Assert(writer.GetEncodedLength() <= initialCapacity);

return writer.TryEncode(destination, out bytesWritten);
}
}
finally
{
writer?.Reset();
}
}

private AsnWriter WriteEncryptedPkcs8PrivateKeyToAsnWriter(ReadOnlySpan<byte> passwordBytes, PbeParameters pbeParameters)
{
AsnWriter? tmp = null;
Expand Down
Loading
Loading