Skip to content

Update Composite ML-DSA import/export APIs #118600

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

Merged
merged 4 commits into from
Aug 13, 2025
Merged

Update Composite ML-DSA import/export APIs #118600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a59401
Update Composite ML-DSA import/export APIs
PranavSenthilnathan Aug 11, 2025
befaba6
Merge branch 'main' of https://github.com/dotnet/runtime into cdsa-api
PranavSenthilnathan Aug 11, 2025
c074e26
Merge branch 'main' of https://github.com/dotnet/runtime into cdsa-api
PranavSenthilnathan Aug 11, 2025
0dde367
merge and PR feedback
PranavSenthilnathan Aug 12, 2025
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
290 changes: 176 additions & 114 deletions src/libraries/Common/src/System/Security/Cryptography/CompositeMLDsa.cs
View file
Open in desktop

Large diffs are not rendered by default.

299 changes: 178 additions & 121 deletions src/libraries/Common/src/System/Security/Cryptography/CompositeMLDsaAlgorithm.cs
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/libraries/Common/src/System/Security/Cryptography/CompositeMLDsaCng.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ protected override int SignDataCore(ReadOnlySpan<byte> data, ReadOnlySpan<byte>
throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_AlgorithmNotSupported, nameof(CompositeMLDsa)));

/// <inheritdoc/>
protected override bool TryExportCompositeMLDsaPrivateKeyCore(Span<byte> destination, out int bytesWritten) =>
protected override int ExportCompositeMLDsaPrivateKeyCore(Span<byte> destination) =>
throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_AlgorithmNotSupported, nameof(CompositeMLDsa)));

/// <inheritdoc/>
protected override bool TryExportCompositeMLDsaPublicKeyCore(Span<byte> destination, out int bytesWritten) =>
protected override int ExportCompositeMLDsaPublicKeyCore(Span<byte> destination) =>
throw new PlatformNotSupportedException(SR.Format(SR.Cryptography_AlgorithmNotSupported, nameof(CompositeMLDsa)));

/// <inheritdoc/>
Expand Down
4 changes: 2 additions & 2 deletions ...ries/Common/src/System/Security/Cryptography/CompositeMLDsaImplementation.NotSupported.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ protected override bool VerifyDataCore(ReadOnlySpan<byte> data, ReadOnlySpan<byt
protected override bool TryExportPkcs8PrivateKeyCore(Span<byte> destination, out int bytesWritten) =>
throw new PlatformNotSupportedException();

protected override bool TryExportCompositeMLDsaPublicKeyCore(Span<byte> destination, out int bytesWritten) =>
protected override int ExportCompositeMLDsaPublicKeyCore(Span<byte> destination) =>
throw new PlatformNotSupportedException();

protected override bool TryExportCompositeMLDsaPrivateKeyCore(Span<byte> destination, out int bytesWritten) =>
protected override int ExportCompositeMLDsaPrivateKeyCore(Span<byte> destination) =>
throw new PlatformNotSupportedException();
}
}
4 changes: 2 additions & 2 deletions ...libraries/Common/src/System/Security/Cryptography/CompositeMLDsaImplementation.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ protected override bool VerifyDataCore(ReadOnlySpan<byte> data, ReadOnlySpan<byt
protected override bool TryExportPkcs8PrivateKeyCore(Span<byte> destination, out int bytesWritten) =>
throw new PlatformNotSupportedException();

protected override bool TryExportCompositeMLDsaPublicKeyCore(Span<byte> destination, out int bytesWritten) =>
protected override int ExportCompositeMLDsaPublicKeyCore(Span<byte> destination) =>
throw new PlatformNotSupportedException();

protected override bool TryExportCompositeMLDsaPrivateKeyCore(Span<byte> destination, out int bytesWritten) =>
protected override int ExportCompositeMLDsaPrivateKeyCore(Span<byte> destination) =>
throw new PlatformNotSupportedException();
}
}
30 changes: 18 additions & 12 deletions src/libraries/Common/src/System/Security/Cryptography/CompositeMLDsaManaged.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,26 +370,29 @@ protected override bool VerifyDataCore(ReadOnlySpan<byte> data, ReadOnlySpan<byt
protected override bool TryExportPkcs8PrivateKeyCore(Span<byte> destination, out int bytesWritten) =>
throw new PlatformNotSupportedException();

protected override bool TryExportCompositeMLDsaPublicKeyCore(Span<byte> destination, out int bytesWritten)
protected override int ExportCompositeMLDsaPublicKeyCore(Span<byte> destination)
{
// draft-ietf-lamps-pq-composite-sigs-latest (June 20, 2025), 5.1
// 1. Combine and output the encoded public key
//
// output mldsaPK || tradPK

int bytesWritten = 0;

_mldsa.ExportMLDsaPublicKey(destination.Slice(0, AlgorithmDetails.MLDsaAlgorithm.PublicKeySizeInBytes));
bytesWritten += AlgorithmDetails.MLDsaAlgorithm.PublicKeySizeInBytes;

if (_componentAlgorithm.TryExportPublicKey(destination.Slice(AlgorithmDetails.MLDsaAlgorithm.PublicKeySizeInBytes), out int componentBytesWritten))
if (!_componentAlgorithm.TryExportPublicKey(destination.Slice(AlgorithmDetails.MLDsaAlgorithm.PublicKeySizeInBytes), out int componentBytesWritten))
{
bytesWritten = AlgorithmDetails.MLDsaAlgorithm.PublicKeySizeInBytes + componentBytesWritten;
return true;
throw new CryptographicException();
}

bytesWritten = 0;
return false;
bytesWritten += componentBytesWritten;

return bytesWritten;
}

protected override bool TryExportCompositeMLDsaPrivateKeyCore(Span<byte> destination, out int bytesWritten)
protected override int ExportCompositeMLDsaPrivateKeyCore(Span<byte> destination)
{
// draft-ietf-lamps-pq-composite-sigs-latest (June 20, 2025), 5.2
// 1. Combine and output the encoded private key
Expand All @@ -398,16 +401,19 @@ protected override bool TryExportCompositeMLDsaPrivateKeyCore(Span<byte> destina

try
{
int bytesWritten = 0;

_mldsa.ExportMLDsaPrivateSeed(destination.Slice(0, AlgorithmDetails.MLDsaAlgorithm.PrivateSeedSizeInBytes));
bytesWritten += AlgorithmDetails.MLDsaAlgorithm.PrivateSeedSizeInBytes;

if (_componentAlgorithm.TryExportPrivateKey(destination.Slice(AlgorithmDetails.MLDsaAlgorithm.PrivateSeedSizeInBytes), out int componentBytesWritten))
if (!_componentAlgorithm.TryExportPrivateKey(destination.Slice(AlgorithmDetails.MLDsaAlgorithm.PrivateSeedSizeInBytes), out int componentBytesWritten))
{
bytesWritten = AlgorithmDetails.MLDsaAlgorithm.PrivateSeedSizeInBytes + componentBytesWritten;
return true;
throw new CryptographicException();
}

bytesWritten = 0;
return false;
bytesWritten += componentBytesWritten;

return bytesWritten;
}
catch (CryptographicException)
{
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/Common/src/System/Security/Cryptography/CryptoPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ internal static void Return(byte[] array, int clearSize = ClearAll)

internal Span<byte> Span { get; private set; }

internal readonly bool IsRented => _rented is not null;

public void Dispose()
{
Return();
Expand Down
Loading
Loading