Skip to content

Add missing null check for SlhDsa's constructor #115944

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 2 commits into from
May 24, 2025
Merged

Add missing null check for SlhDsa's constructor #115944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8c144f
Add missing null check for SlhDsa's constructor.
vcsjones May 23, 2025
143ce80
Add exception to docs
vcsjones May 23, 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
4 changes: 4 additions & 0 deletions src/libraries/Common/src/System/Security/Cryptography/SlhDsa.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ public abstract partial class SlhDsa : IDisposable
/// <param name="algorithm">
/// The specific SLH-DSA algorithm for this key.
/// </param>
/// <exception cref="ArgumentNullException">
/// <paramref name="algorithm" /> is <see langword="null" />.
/// </exception>
protected SlhDsa(SlhDsaAlgorithm algorithm)
{
ArgumentNullException.ThrowIfNull(algorithm);
Algorithm = algorithm;
}

Expand Down
8 changes: 7 additions & 1 deletion ...tests/System/Security/Cryptography/AlgorithmImplementations/SlhDsa/SlhDsaContractTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ public static void NullArgumentValidation(SlhDsaAlgorithm algorithm, bool should
AssertExtensions.Throws<ArgumentNullException>("pbeParameters", () => slhDsa.TryExportEncryptedPkcs8PrivateKey(string.Empty, null, Span<byte>.Empty, out _));
}

[Fact]
public static void ArgumentValidation_Ctor_NullAlgorithm()
{
AssertExtensions.Throws<ArgumentNullException>("algorithm", static () => new SlhDsaMockImplementation(null));
}

[Theory]
[MemberData(nameof(ArgumentValidationData))]
public static void ArgumentValidation(SlhDsaAlgorithm algorithm, bool shouldDispose)
Expand Down Expand Up @@ -95,7 +101,7 @@ public static void ArgumentValidation_PbeParameters(SlhDsaAlgorithm algorithm, b
SlhDsaTestHelpers.AssertEncryptedExportPkcs8PrivateKey(export =>
{
// Unknown algorithm
AssertExtensions.Throws<CryptographicException>(() =>
AssertExtensions.Throws<CryptographicException>(() =>
export(slhDsa, "PLACEHOLDER", new PbeParameters(PbeEncryptionAlgorithm.Unknown, HashAlgorithmName.SHA1, 42)));

// TripleDes3KeyPkcs12 only works with SHA1
Expand Down
Loading