Skip to content

Improve EnclaveDiffieHellmanInfo.Size #4346

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
cheenamalhotra merged 2 commits into from
Jun 10, 2026
Merged

Improve EnclaveDiffieHellmanInfo.Size #4346

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
c412242
Improve `EnclaveDiffieHellmanInfo.Size`
jnyrup Jun 7, 2026
eceb1d3
Uncomment Debug.Asserts
jnyrup Jun 9, 2026
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
2 changes: 1 addition & 1 deletion ...rosoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncryptedEnclaveProviderUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public EnclavePublicKey(byte[] payload)

internal class EnclaveDiffieHellmanInfo
{
public int Size => sizeof(int) + sizeof(int) + PublicKey?.Length ?? 0 + PublicKeySignature?.Length ?? 0;
public int Size => sizeof(int) + sizeof(int) + (PublicKey?.Length ?? 0) + (PublicKeySignature?.Length ?? 0);

public byte[] PublicKey { get; private set; }

Expand Down
3 changes: 1 addition & 2 deletions ...osoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AzureAttestationBasedEnclaveProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,7 @@ public AzureAttestationInfo(byte[] attestationInfo)
EnclaveDHInfo = new EnclaveDiffieHellmanInfo(attestationInfo, offset);
offset += EnclaveDHInfo.Size;

// TODO(GH-3604): Fix this failing assertion.
// Debug.Assert(offset == attestationInfo.Length);
Debug.Assert(offset == attestationInfo.Length);
}
catch (Exception exception)
{
Expand Down
3 changes: 1 addition & 2 deletions ...Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ public AttestationInfo(byte[] attestationInfo)
EnclaveDHInfo = new EnclaveDiffieHellmanInfo(attestationInfo, offset);
offset += Convert.ToInt32(EnclaveDHInfo.Size);

// TODO(GH-3604): Fix this failing assertion.
// Debug.Assert(offset == attestationInfo.Length, $"{offset} == {attestationInfo.Length}");
Debug.Assert(offset == attestationInfo.Length, $"{offset} == {attestationInfo.Length}");
}
}

Expand Down
Loading