Skip to content

Commit b69d1bd

Browse files
authored
Added warning disables for the newly added CA2022 warning about not reading SSL streams inexactly. (#4094)
1 parent 0d4f9b6 commit b69d1bd

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/benchmarks/micro/libraries/System.Net.Security/SslStreamTests.Context.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,11 @@ await Task.WhenAll(
5454
// In Tls1.3 part of handshake happens with data exchange.
5555
// To be consistent we do this extra step for all protocol versions
5656
await sslClient.WriteAsync(_clientBuffer, default);
57+
#pragma warning disable CA2022 // Avoid inexact read
5758
await sslServer.ReadAsync(_serverBuffer, default);
5859
await sslServer.WriteAsync(_serverBuffer, default);
5960
await sslClient.ReadAsync(_clientBuffer, default);
61+
#pragma warning restore CA2022
6062
}
6163
}
6264

src/benchmarks/micro/libraries/System.Net.Security/SslStreamTests.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,11 @@ await Task.WhenAll(
151151
{
152152
// In Tls1.3 part of handshake happens with data exchange.
153153
await sslClient.WriteAsync(_clientBuffer, cts.Token);
154+
#pragma warning disable CA2022 // Avoid inexact read
154155
await sslServer.ReadAsync(_serverBuffer, cts.Token);
155156
await sslServer.WriteAsync(_serverBuffer, cts.Token);
156157
await sslClient.ReadAsync(_clientBuffer, cts.Token);
158+
#pragma warning restore CA2022
157159
}
158160
}
159161
}
@@ -189,11 +191,12 @@ await Task.WhenAll(
189191
sslServer.AuthenticateAsServerAsync(serverOptions, cts.Token));
190192

191193
byte[] clientBuffer = new byte[1], serverBuffer = new byte[1];
192-
193194
await sslClient.WriteAsync(clientBuffer, cts.Token);
195+
#pragma warning disable CA2022 // Avoid inexact read
194196
await sslServer.ReadAsync(serverBuffer, cts.Token);
195197
await sslServer.WriteAsync(serverBuffer, cts.Token);
196198
await sslClient.ReadAsync(clientBuffer, cts.Token);
199+
#pragma warning restore CA2022
197200
}
198201
}
199202

@@ -208,7 +211,9 @@ public async Task WriteReadAsync()
208211
for (int i = 0; i < ReadWriteIterations; i++)
209212
{
210213
await _sslClient.WriteAsync(clientBuffer, default);
214+
#pragma warning disable CA2022 // Avoid inexact read
211215
await _sslServer.ReadAsync(serverBuffer, default);
216+
#pragma warning restore CA2022
212217
}
213218
}
214219

@@ -219,7 +224,9 @@ public async Task LargeWriteReadAsync()
219224
Memory<byte> clientBuffer = _largeClientBuffer;
220225
Memory<byte> serverBuffer = _largeServerBuffer;
221226
await _sslClient.WriteAsync(clientBuffer, default);
227+
#pragma warning disable CA2022 // Avoid inexact read
222228
await _sslServer.ReadAsync(serverBuffer, default);
229+
#pragma warning restore CA2022
223230
}
224231

225232
[Benchmark(OperationsPerInvoke = ReadWriteIterations)]
@@ -256,6 +263,7 @@ public async Task ConcurrentReadWrite()
256263
Memory<byte> buffer1 = _clientBuffer;
257264
Memory<byte> buffer2 = _serverBuffer;
258265

266+
#pragma warning disable CA2022 // Avoid inexact read
259267
Task other = Task.Run(async delegate
260268
{
261269
_twoParticipantBarrier.SignalAndWait();
@@ -272,6 +280,7 @@ public async Task ConcurrentReadWrite()
272280
await _sslClient.WriteAsync(buffer2, default);
273281
await _sslServer.ReadAsync(buffer2, default);
274282
}
283+
#pragma warning restore CA2022
275284

276285
await other;
277286
}

0 commit comments

Comments
 (0)