Skip to content

Make NegotiateAuthentication.[Compute/Verify]IntegrityCheck APIs public #96712

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
wfurt merged 7 commits into from
Jan 10, 2024
Merged

Make NegotiateAuthentication.[Compute/Verify]IntegrityCheck APIs public #96712

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3deeca7
Make NegotiateAuthentication.ComputeIntegrityCheck/VerifyIntegrityChe…
filipnavara Jan 9, 2024
6d89780
Update ref source
filipnavara Jan 9, 2024
7ae11f0
Update usage of the internal APIs
filipnavara Jan 9, 2024
b9b9d36
Add unit test
filipnavara Jan 9, 2024
85c4a76
Add exception documentation
filipnavara Jan 9, 2024
e2974c1
Fix Windows implementation of GetMIC
filipnavara Jan 10, 2024
7c70979
Update src/libraries/System.Net.Security/src/System/Net/Security/Nego…
filipnavara Jan 10, 2024
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
Prev Previous commit
Next Next commit
Update usage of the internal APIs
  • Loading branch information
@filipnavara
filipnavara committed Jan 9, 2024
commit 7ae11f040a7c1deab97975fe94d3fcf6a6282081
4 changes: 2 additions & 2 deletions src/libraries/System.Net.Security/src/System/Net/Security/NegotiateStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ private async ValueTask<int> ReadAsync<TIOAdapter>(Memory<byte> buffer, Cancella
const int NtlmSignatureLength = 16;

if (readBytes < NtlmSignatureLength ||
!_context.VerifyMIC(_readBuffer.AsSpan(NtlmSignatureLength, readBytes - NtlmSignatureLength), _readBuffer.AsSpan(0, NtlmSignatureLength)))
!_context.VerifyIntegrityCheck(_readBuffer.AsSpan(NtlmSignatureLength, readBytes - NtlmSignatureLength), _readBuffer.AsSpan(0, NtlmSignatureLength)))
{
statusCode = NegotiateAuthenticationStatusCode.InvalidToken;
}
Expand Down Expand Up @@ -526,7 +526,7 @@ private async Task WriteAsync<TIOAdapter>(ReadOnlyMemory<byte> buffer, Cancellat
if (isNtlm && !isEncrypted)
{
// Non-encrypted NTLM uses an encoding quirk
_context.GetMIC(bufferToWrap.Span, _writeBuffer);
_context.ComputeIntegrityCheck(bufferToWrap.Span, _writeBuffer);
_writeBuffer.Write(bufferToWrap.Span);
statusCode = NegotiateAuthenticationStatusCode.Completed;
}
Expand Down