summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Dettman <peter.dettman@bouncycastle.org>2022-09-02 16:01:46 +0700
committerPeter Dettman <peter.dettman@bouncycastle.org>2022-09-02 16:01:46 +0700
commit0eb75e3c71890e27256b839b58103a8e6cd42e7f (patch)
tree784c753773f01b01643b9cfc630fb6d16c106edc
parentFIx return value for empty read (diff)
downloadBouncyCastle.NET-ed25519-0eb75e3c71890e27256b839b58103a8e6cd42e7f.tar.xz
NullOutputStream => Stream.Null
-rw-r--r--crypto/src/cms/CMSSignedDataStreamGenerator.cs4
-rw-r--r--crypto/src/tls/DtlsServerProtocol.cs2
-rw-r--r--crypto/src/util/io/NullOutputStream.cs17
3 files changed, 2 insertions, 21 deletions
diff --git a/crypto/src/cms/CMSSignedDataStreamGenerator.cs b/crypto/src/cms/CMSSignedDataStreamGenerator.cs
index 0dbdccbeb..5587a9d07 100644
--- a/crypto/src/cms/CMSSignedDataStreamGenerator.cs
+++ b/crypto/src/cms/CMSSignedDataStreamGenerator.cs
@@ -741,9 +741,7 @@ namespace Org.BouncyCastle.Cms
 
 		private static Stream GetSafeOutputStream(Stream s)
 		{
-			if (s == null)
-				return new NullOutputStream();
-			return s;
+			return s ?? Stream.Null;
 		}
 
 		private static Stream GetSafeTeeOutputStream(Stream s1, Stream s2)
diff --git a/crypto/src/tls/DtlsServerProtocol.cs b/crypto/src/tls/DtlsServerProtocol.cs
index 51e013290..e4ce4d6be 100644
--- a/crypto/src/tls/DtlsServerProtocol.cs
+++ b/crypto/src/tls/DtlsServerProtocol.cs
@@ -667,7 +667,7 @@ namespace Org.BouncyCastle.Tls
         protected virtual void ProcessClientHello(ServerHandshakeState state, byte[] body)
         {
             MemoryStream buf = new MemoryStream(body, false);
-            ClientHello clientHello = ClientHello.Parse(buf, new NullOutputStream());
+            ClientHello clientHello = ClientHello.Parse(buf, Stream.Null);
             ProcessClientHello(state, clientHello);
         }
 
diff --git a/crypto/src/util/io/NullOutputStream.cs b/crypto/src/util/io/NullOutputStream.cs
deleted file mode 100644
index c435549d2..000000000
--- a/crypto/src/util/io/NullOutputStream.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-
-namespace Org.BouncyCastle.Utilities.IO
-{
-	internal class NullOutputStream
-		: BaseOutputStream
-	{
-		public override void Write(byte[] buffer, int offset, int count)
-		{
-			Streams.ValidateBufferArguments(buffer, offset, count);
-		}
-
-		public override void WriteByte(byte value)
-		{
-		}
-	}
-}