-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Implement AES-GCM with CryptoKit on macOS #76490
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
Merged
Merged
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
7b4a0be
Implement AES-GCM with CryptoKit on macOS
vcsjones a2b397a
Merge remote-tracking branch 'ms/main' into aes-gcm-crypto-kit
vcsjones 8bb6210
Fix typo
vcsjones 50bc097
Merge remote-tracking branch 'ms/main' into aes-gcm-crypto-kit
vcsjones abc8c19
Revert OpenSSL work for macOS GCM
vcsjones 253ba44
Fixup macOS
vcsjones 2f7e5d0
Respond to code review feedback
vcsjones a6921ee
Remove conditional from tests since it's not needed anymore
vcsjones 59de3e3
Code review feedback
vcsjones ef9b473
Restart CI
vcsjones 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 hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
78 changes: 78 additions & 0 deletions
78
src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/AesGcm.macOS.cs
This file contains hidden or 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,78 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System.Diagnostics; | ||
using System.Diagnostics.CodeAnalysis; | ||
using Microsoft.Win32.SafeHandles; | ||
|
||
namespace System.Security.Cryptography | ||
{ | ||
public sealed partial class AesGcm | ||
{ | ||
private byte[]? _key; | ||
|
||
// CryptoKit added AES.GCM in macOS 10.15, which is our minimum target for macOS. | ||
public static bool IsSupported => true; | ||
|
||
// CryptoKit only supports 16 byte tags. | ||
public static KeySizes TagByteSizes { get; } = new KeySizes(16, 16, 1); | ||
|
||
|
||
vcsjones marked this conversation as resolved.
Show resolved
Hide resolved
|
||
[MemberNotNull(nameof(_key))] | ||
private void ImportKey(ReadOnlySpan<byte> key) | ||
{ | ||
// We should only be calling this in the constructor, so there shouldn't be a previous key. | ||
Debug.Assert(_key is null); | ||
|
||
// Pin the array on the POH so that the GC doesn't move it around to allow zeroing to be more effective. | ||
_key = GC.AllocateArray<byte>(key.Length, pinned: true); | ||
key.CopyTo(_key); | ||
} | ||
|
||
private void EncryptCore( | ||
ReadOnlySpan<byte> nonce, | ||
ReadOnlySpan<byte> plaintext, | ||
Span<byte> ciphertext, | ||
Span<byte> tag, | ||
ReadOnlySpan<byte> associatedData) | ||
{ | ||
CheckDisposed(); | ||
Interop.AppleCrypto.AesGcmEncrypt( | ||
_key, | ||
nonce, | ||
plaintext, | ||
ciphertext, | ||
tag, | ||
associatedData); | ||
} | ||
|
||
private void DecryptCore( | ||
ReadOnlySpan<byte> nonce, | ||
ReadOnlySpan<byte> ciphertext, | ||
ReadOnlySpan<byte> tag, | ||
Span<byte> plaintext, | ||
ReadOnlySpan<byte> associatedData) | ||
{ | ||
CheckDisposed(); | ||
Interop.AppleCrypto.AesGcmDecrypt( | ||
_key, | ||
nonce, | ||
ciphertext, | ||
tag, | ||
plaintext, | ||
associatedData); | ||
} | ||
|
||
public void Dispose() | ||
{ | ||
CryptographicOperations.ZeroMemory(_key); | ||
_key = null; | ||
} | ||
|
||
[MemberNotNull(nameof(_key))] | ||
private void CheckDisposed() | ||
{ | ||
ObjectDisposedException.ThrowIf(_key is null, this); | ||
} | ||
} | ||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.