Skip to content

[release/10.0] Limit the use of a pointer to the lexical scope of the target #120387

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
wants to merge 2 commits into
base: release/10.0
Choose a base branch
from
+9 −9
Open

[release/10.0] Limit the use of a pointer to the lexical scope of the target #120387

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98130dd
Limit the use of a pointer to the lexical scope of the target
bartonjs Oct 2, 2025
962f5f5
Update src/libraries/System.Security.Cryptography/src/System/Security…
bartonjs Oct 3, 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
18 changes: 9 additions & 9 deletions ...Cryptography/src/System/Security/Cryptography/X509Certificates/StorePal.Windows.Export.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,20 +109,20 @@ private unsafe byte[] ExportPkcs12Core(Pkcs12ExportPbeParameters? exportParamete
Interop.Crypt32.PKCS12_PBES2_EXPORT_PARAMS* exportParams = null;
PbeParameters? reEncodeParameters = null;

char* PKCS12_PBES2_ALG_AES256_SHA256 = stackalloc char[] { 'A', 'E', 'S', '2', '5', '6', '-', 'S', 'H', 'A', '2', '5', '6', '\0' };
Interop.Crypt32.PKCS12_PBES2_EXPORT_PARAMS specifiedParams = new()
{
dwSize = (uint)sizeof(Interop.Crypt32.PKCS12_PBES2_EXPORT_PARAMS),
hNcryptDescriptor = 0,
pwszPbes2Alg = PKCS12_PBES2_ALG_AES256_SHA256,
};

if (exportParameters is Pkcs12ExportPbeParameters.Pbes2Aes256Sha256 or Pkcs12ExportPbeParameters.Default)
{
if (s_supportsAes256Sha256)
{
flags |= Interop.Crypt32.PFXExportFlags.PKCS12_EXPORT_PBES2_PARAMS;
// PKCS12_PBES2_ALG_AES256_SHA256
char* algStr = stackalloc char[] { 'A', 'E', 'S', '2', '5', '6', '-', 'S', 'H', 'A', '2', '5', '6', '\0' };
Interop.Crypt32.PKCS12_PBES2_EXPORT_PARAMS p = new()
{
dwSize = (uint)Marshal.SizeOf<Interop.Crypt32.PKCS12_PBES2_EXPORT_PARAMS>(),
hNcryptDescriptor = 0,
pwszPbes2Alg = algStr,
};
exportParams = &p;
exportParams = &specifiedParams;
}
else
{
Expand Down
Loading