Skip to content

rework locking in SslStream to support TLS1.3 #32925

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 8 commits into from
Mar 20, 2020
Merged

rework locking in SslStream to support TLS1.3 #32925

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b5d293a
initial locking
wfurt Feb 27, 2020
785cd8c
Merge branch 'master' of https://github.com/dotnet/runtime into sslLock2
wfurt Feb 27, 2020
4240071
Merge branch 'master' of https://github.com/dotnet/runtime into sslLock2
wfurt Feb 27, 2020
06bfbc5
feedback from review
wfurt Feb 28, 2020
b13ceb9
update _handshakeWaiter
wfurt Feb 28, 2020
e583da8
feedback from review
wfurt Feb 28, 2020
6b54439
feedback from review
wfurt Mar 10, 2020
fea08fc
feedback from review
wfurt Mar 20, 2020
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
36 changes: 15 additions & 21 deletions src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,14 +333,11 @@ internal static int Encrypt(SafeSslHandle context, ReadOnlySpan<byte> input, ref
int retVal;
Exception? innerError = null;

lock (context)
{
retVal = Ssl.SslWrite(context, ref MemoryMarshal.GetReference(input), input.Length);
retVal = Ssl.SslWrite(context, ref MemoryMarshal.GetReference(input), input.Length);

if (retVal != input.Length)
{
errorCode = GetSslError(context, retVal, out innerError);
}
if (retVal != input.Length)
{
errorCode = GetSslError(context, retVal, out innerError);
}

if (retVal != input.Length)
Expand Down Expand Up @@ -390,30 +387,27 @@ internal static int Decrypt(SafeSslHandle context, byte[] outBuffer, int offset,
int retVal = BioWrite(context.InputBio!, outBuffer, offset, count);
Exception? innerError = null;

lock (context)
if (retVal == count)
{
if (retVal == count)
unsafe
{
unsafe
fixed (byte* fixedBuffer = outBuffer)
{
fixed (byte* fixedBuffer = outBuffer)
{
retVal = Ssl.SslRead(context, fixedBuffer + offset, outBuffer.Length);
}
}

if (retVal > 0)
{
count = retVal;
retVal = Ssl.SslRead(context, fixedBuffer + offset, outBuffer.Length);
}
}

if (retVal != count)
if (retVal > 0)
{
errorCode = GetSslError(context, retVal, out innerError);
count = retVal;
}
}

if (retVal != count)
{
errorCode = GetSslError(context, retVal, out innerError);
}

if (retVal != count)
{
retVal = 0;
Expand Down
14 changes: 0 additions & 14 deletions ...ibraries/System.Net.Security/src/System/Net/Security/SslStream.Implementation.Adapters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ public partial class SslStream
private interface ISslIOAdapter
{
ValueTask<int> ReadAsync(Memory<byte> buffer);
ValueTask<int> ReadLockAsync(Memory<byte> buffer);
Task WriteLockAsync();
ValueTask WriteAsync(byte[] buffer, int offset, int count);
CancellationToken CancellationToken { get; }
}
Expand All @@ -31,10 +29,6 @@ public AsyncSslIOAdapter(SslStream sslStream, CancellationToken cancellationToke

public ValueTask<int> ReadAsync(Memory<byte> buffer) => _sslStream.InnerStream.ReadAsync(buffer, _cancellationToken);

public ValueTask<int> ReadLockAsync(Memory<byte> buffer) => _sslStream.CheckEnqueueReadAsync(buffer);

public Task WriteLockAsync() => _sslStream.CheckEnqueueWriteAsync();

public ValueTask WriteAsync(byte[] buffer, int offset, int count) => _sslStream.InnerStream.WriteAsync(new ReadOnlyMemory<byte>(buffer, offset, count), _cancellationToken);

public CancellationToken CancellationToken => _cancellationToken;
Expand All @@ -48,20 +42,12 @@ public AsyncSslIOAdapter(SslStream sslStream, CancellationToken cancellationToke

public ValueTask<int> ReadAsync(Memory<byte> buffer) => new ValueTask<int>(_sslStream.InnerStream.Read(buffer.Span));

public ValueTask<int> ReadLockAsync(Memory<byte> buffer) => new ValueTask<int>(_sslStream.CheckEnqueueRead(buffer));

public ValueTask WriteAsync(byte[] buffer, int offset, int count)
{
_sslStream.InnerStream.Write(buffer, offset, count);
return default;
}

public Task WriteLockAsync()
{
_sslStream.CheckEnqueueWrite();
return Task.CompletedTask;
}

public CancellationToken CancellationToken => default;
}
}
Expand Down
Loading