-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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.
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
Do not use AllocHGlobal in Pkcs12Reader #97447
Closed
Closed
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
af7c0a1
Do not use AllocHGlobal in Pkcs12Reader
krwq b36e488
Revert "Do not use AllocHGlobal in Pkcs12Reader"
krwq 05004d3
Handle for AllocHGlobal with ZeroMemory
krwq aa43fe8
Add comment on why we use unmanaged buffer
krwq b087c24
Move PointerMemoryManager to the caller and add disclaimer
krwq da0746a
Add UnmanagedCryptoBufferManager
krwq File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
...c/System/Security/Cryptography/X509Certificates/SafeLocalAllocWithClearOnDisposeHandle.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System.Runtime.InteropServices; | ||
using Microsoft.Win32.SafeHandles; | ||
|
||
namespace System.Security.Cryptography.X509Certificates | ||
{ | ||
/// <summary> | ||
/// SafeHandle for LocalAlloc'd memory which calls ZeroMemory when releasing handle. | ||
/// </summary> | ||
internal sealed class SafeLocalAllocWithClearOnDisposeHandle : SafeCrypt32Handle<SafeLocalAllocWithClearOnDisposeHandle> | ||
{ | ||
internal int Length { get; private set; } | ||
|
||
public static SafeLocalAllocWithClearOnDisposeHandle Create(int cb) | ||
{ | ||
var h = new SafeLocalAllocWithClearOnDisposeHandle(); | ||
h.SetHandle(Marshal.AllocHGlobal(cb)); | ||
h.Length = cb; | ||
return h; | ||
} | ||
|
||
internal unsafe Span<byte> DangerousGetSpan() | ||
=> new Span<byte>((void*)handle, Length); | ||
|
||
protected sealed override unsafe bool ReleaseHandle() | ||
{ | ||
CryptographicOperations.ZeroMemory(DangerousGetSpan()); | ||
Marshal.FreeHGlobal(handle); | ||
return true; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
...y/src/System/Security/Cryptography/X509Certificates/UnmanagedCryptoBufferMemoryManager.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System.Buffers; | ||
|
||
namespace System.Security.Cryptography.X509Certificates | ||
{ | ||
/// <summary> | ||
/// Unmanaged memory manager backed by buffer allocated with Marshal.AllocHGlobal ensuring memory is cleared on Dispose. | ||
/// </summary> | ||
internal sealed unsafe class UnmanagedCryptoBufferMemoryManager : MemoryManager<byte> | ||
{ | ||
private readonly SafeLocalAllocWithClearOnDisposeHandle _handle; | ||
|
||
internal UnmanagedCryptoBufferMemoryManager(int length) | ||
{ | ||
_handle = SafeLocalAllocWithClearOnDisposeHandle.Create(length); | ||
} | ||
|
||
protected override void Dispose(bool disposing) | ||
{ | ||
if (disposing) | ||
{ | ||
_handle.Dispose(); | ||
} | ||
} | ||
|
||
public override Span<byte> GetSpan() | ||
=> _handle.DangerousGetSpan(); | ||
|
||
public override MemoryHandle Pin(int elementIndex = 0) | ||
{ | ||
throw new NotSupportedException(); | ||
} | ||
|
||
public override void Unpin() | ||
{ | ||
} | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is following pattern of https://github.com/dotnet/runtime/blob/main/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/SafeLocalAllocHandle.cs