Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

[release/1.1.0] Fix SslStream.WriteAsync with 0-byte write #13384

Merged
merged 1 commit into from
Nov 5, 2016
Merged

[release/1.1.0] Fix SslStream.WriteAsync with 0-byte write #13384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/System.Net.Security/src/System/Net/SecureProtocols/SslStreamInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ private void StartWriting(byte[] buffer, int offset, int count, AsyncProtocolReq
{
// If it's an empty message and the PAL doesn't support that,
// we're done.
return;
break;
}

// Request a write IO slot.
Expand Down
4 changes: 3 additions & 1 deletion src/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void SslStream_StreamToStream_Successive_ClientWrite_Sync_Success()

[OuterLoop] // TODO: Issue #11345
[Fact]
public void SslStream_StreamToStream_Successive_ClientWrite_Sync_WithZeroBytes_Success()
public void SslStream_StreamToStream_Successive_ClientWrite_WithZeroBytes_Success()
{
byte[] recvBuf = new byte[_sampleMsg.Length];
VirtualNetwork network = new VirtualNetwork();
Expand All @@ -110,13 +110,15 @@ public void SslStream_StreamToStream_Successive_ClientWrite_Sync_WithZeroBytes_S
Assert.True(result, "Handshake completed.");

clientSslStream.Write(Array.Empty<byte>());
clientSslStream.WriteAsync(Array.Empty<byte>(), 0, 0).Wait();
clientSslStream.Write(_sampleMsg);

serverSslStream.Read(recvBuf, 0, _sampleMsg.Length);

Assert.True(VerifyOutput(recvBuf, _sampleMsg), "verify first read data is as expected.");

clientSslStream.Write(_sampleMsg);
clientSslStream.WriteAsync(Array.Empty<byte>(), 0, 0).Wait();
clientSslStream.Write(Array.Empty<byte>());

serverSslStream.Read(recvBuf, 0, _sampleMsg.Length);
Expand Down