1 files changed, 26 insertions, 50 deletions

diff --git a/crypto/src/asn1/ocsp/ResponseBytes.cs b/crypto/src/asn1/ocsp/ResponseBytes.cs
index d3ea044bf..c5cbc3d3f 100644
--- a/crypto/src/asn1/ocsp/ResponseBytes.cs
+++ b/crypto/src/asn1/ocsp/ResponseBytes.cs
@@ -1,70 +1,46 @@
 using System;
 
-using Org.BouncyCastle.Utilities;
-
 namespace Org.BouncyCastle.Asn1.Ocsp
 {
     public class ResponseBytes
         : Asn1Encodable
     {
-        private readonly DerObjectIdentifier responseType;
-        private readonly Asn1OctetString response;
-
-		public static ResponseBytes GetInstance(
-			Asn1TaggedObject	obj,
-			bool				explicitly)
-		{
-			return GetInstance(Asn1Sequence.GetInstance(obj, explicitly));
-		}
-
-		public static ResponseBytes GetInstance(
-			object obj)
-		{
-			if (obj == null || obj is ResponseBytes)
-			{
-				return (ResponseBytes)obj;
-			}
+        public static ResponseBytes GetInstance(object obj)
+        {
+            if (obj == null)
+                return null;
+            if (obj is ResponseBytes responseBytes)
+                return responseBytes;
+            return new ResponseBytes(Asn1Sequence.GetInstance(obj));
+        }
 
-			if (obj is Asn1Sequence)
-			{
-				return new ResponseBytes((Asn1Sequence)obj);
-			}
+        public static ResponseBytes GetInstance(Asn1TaggedObject obj, bool explicitly)
+        {
+            return new ResponseBytes(Asn1Sequence.GetInstance(obj, explicitly));
+        }
 
-            throw new ArgumentException("unknown object in factory: " + Platform.GetTypeName(obj), "obj");
-		}
+        private readonly DerObjectIdentifier m_responseType;
+        private readonly Asn1OctetString m_response;
 
-		public ResponseBytes(
-            DerObjectIdentifier	responseType,
-            Asn1OctetString		response)
+        public ResponseBytes(DerObjectIdentifier responseType, Asn1OctetString response)
         {
-			if (responseType == null)
-				throw new ArgumentNullException("responseType");
-			if (response == null)
-				throw new ArgumentNullException("response");
-
-			this.responseType = responseType;
-            this.response = response;
+			m_responseType = responseType ?? throw new ArgumentNullException(nameof(responseType));
+            m_response = response ?? throw new ArgumentNullException(nameof(response));
         }
 
-		private ResponseBytes(
-            Asn1Sequence seq)
+        private ResponseBytes(Asn1Sequence seq)
         {
-			if (seq.Count != 2)
-				throw new ArgumentException("Wrong number of elements in sequence", "seq");
+            int count = seq.Count;
+            if (count != 2)
+                throw new ArgumentException("Bad sequence size: " + count, nameof(seq));
 
-			this.responseType = DerObjectIdentifier.GetInstance(seq[0]);
-            this.response = Asn1OctetString.GetInstance(seq[1]);
+            m_responseType = DerObjectIdentifier.GetInstance(seq[0]);
+            m_response = Asn1OctetString.GetInstance(seq[1]);
         }
 
-		public DerObjectIdentifier ResponseType
-		{
-			get { return responseType; }
-		}
+        public DerObjectIdentifier ResponseType => m_responseType;
 
-		public Asn1OctetString Response
-		{
-			get { return response; }
-		}
+        public Asn1OctetString Response => m_response;
 
 		/**
          * Produce an object suitable for an Asn1OutputStream.
@@ -76,7 +52,7 @@ namespace Org.BouncyCastle.Asn1.Ocsp
          */
         public override Asn1Object ToAsn1Object()
         {
-			return new DerSequence(responseType, response);
+			return new DerSequence(m_responseType, m_response);
         }
     }
 }