Skip to content
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

Jump to bottom

Use checked arithmetic to prevent stack overflow in Pkcs12Kdf #68422

Merged
merged 1 commit into from Apr 26, 2022
+2 −2
Merged

Use checked arithmetic to prevent stack overflow in Pkcs12Kdf #68422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libraries/Common/src/System/Security/Cryptography/Pkcs12Kdf.cs
View file
Open in desktop
Expand Up @@ -130,10 +130,10 @@ internal static class Pkcs12Kdf
// (The RFC quote considers the trailing '\0' to be part of the string,
// so "empty string" from this RFC means "null string" in C#, and C#'s
// "empty string" is not 'empty' in this context.)
int PLen = ((passLen - 1 + vBytes) / vBytes) * vBytes;
int PLen = checked(((passLen - 1 + vBytes) / vBytes) * vBytes);

// 4. Set I=S||P to be the concatenation of S and P.
int ILen = SLen + PLen;
int ILen = checked(SLen + PLen);
Span<byte> I = stackalloc byte[0];
byte[]? IRented = null;

Expand Down