Skip to content

[release/8.0] Fix implementation of NegotiateAuthentication.Wrap for Kerberos on Windows #91311

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
merged 2 commits into from
Sep 11, 2023
Merged

[release/8.0] Fix implementation of NegotiateAuthentication.Wrap for Kerberos on Windows #91311

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a63c005
Fix implementation of NegotiateAuthentication.Wrap for Kerberos on Wi…
filipnavara Aug 26, 2023
b610265
Merge branch 'release/8.0' into backport/pr-91152-to-release/8.0
carlossanlop Aug 30, 2023
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
31 changes: 24 additions & 7 deletions src/libraries/System.Net.Security/src/System/Net/NegotiateAuthenticationPal.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,28 +421,32 @@ public override unsafe NegotiateAuthenticationStatusCode Wrap(ReadOnlySpan<byte>
Debug.Assert(success);

// alloc new output buffer if not supplied or too small
int resultSize = input.Length + sizes.cbMaxSignature;
int resultSize = input.Length + sizes.cbSecurityTrailer + sizes.cbBlockSize;
Span<byte> outputBuffer = outputWriter.GetSpan(resultSize);

// make a copy of user data for in-place encryption
input.CopyTo(outputBuffer.Slice(sizes.cbMaxSignature, input.Length));
input.CopyTo(outputBuffer.Slice(sizes.cbSecurityTrailer, input.Length));

isEncrypted = requestEncryption;

fixed (byte* outputPtr = outputBuffer)
{
// Prepare buffers TOKEN(signature), DATA and Padding.
Interop.SspiCli.SecBuffer* unmanagedBuffer = stackalloc Interop.SspiCli.SecBuffer[2];
Interop.SspiCli.SecBuffer* unmanagedBuffer = stackalloc Interop.SspiCli.SecBuffer[3];
Interop.SspiCli.SecBuffer* tokenBuffer = &unmanagedBuffer[0];
Interop.SspiCli.SecBuffer* dataBuffer = &unmanagedBuffer[1];
Interop.SspiCli.SecBuffer* paddingBuffer = &unmanagedBuffer[2];
tokenBuffer->BufferType = SecurityBufferType.SECBUFFER_TOKEN;
tokenBuffer->pvBuffer = (IntPtr)(outputPtr);
tokenBuffer->cbBuffer = sizes.cbMaxSignature;
tokenBuffer->cbBuffer = sizes.cbSecurityTrailer;
dataBuffer->BufferType = SecurityBufferType.SECBUFFER_DATA;
dataBuffer->pvBuffer = (IntPtr)(outputPtr + sizes.cbMaxSignature);
dataBuffer->pvBuffer = (IntPtr)(outputPtr + sizes.cbSecurityTrailer);
dataBuffer->cbBuffer = input.Length;
paddingBuffer->BufferType = SecurityBufferType.SECBUFFER_PADDING;
paddingBuffer->pvBuffer = (IntPtr)(outputPtr + sizes.cbSecurityTrailer + input.Length);
paddingBuffer->cbBuffer = sizes.cbBlockSize;

Interop.SspiCli.SecBufferDesc sdcInOut = new Interop.SspiCli.SecBufferDesc(2)
Interop.SspiCli.SecBufferDesc sdcInOut = new Interop.SspiCli.SecBufferDesc(3)
{
pBuffers = unmanagedBuffer
};
Expand All @@ -460,7 +464,20 @@ public override unsafe NegotiateAuthenticationStatusCode Wrap(ReadOnlySpan<byte>
};
}

outputWriter.Advance(tokenBuffer->cbBuffer + dataBuffer->cbBuffer);
// Compact the result
if (tokenBuffer->cbBuffer != sizes.cbSecurityTrailer)
{
outputBuffer.Slice(sizes.cbSecurityTrailer, dataBuffer->cbBuffer).CopyTo(
outputBuffer.Slice(tokenBuffer->cbBuffer, dataBuffer->cbBuffer));
}
if (tokenBuffer->cbBuffer != sizes.cbSecurityTrailer ||
paddingBuffer->cbBuffer != sizes.cbBlockSize)
{
outputBuffer.Slice(sizes.cbSecurityTrailer + input.Length, paddingBuffer->cbBuffer).CopyTo(
outputBuffer.Slice(tokenBuffer->cbBuffer + dataBuffer->cbBuffer, paddingBuffer->cbBuffer));
}

outputWriter.Advance(tokenBuffer->cbBuffer + dataBuffer->cbBuffer + paddingBuffer->cbBuffer);
return NegotiateAuthenticationStatusCode.Completed;
}
}
Expand Down