From 35d6cf0af1e8305c84fb2fccafd97fc91db9f099 Mon Sep 17 00:00:00 2001
From: Peter Dettman <peter.dettman@bouncycastle.org>
Date: Tue, 11 Apr 2023 18:13:27 +0700
Subject: Add Memory/Span accessors to avoid some copies

---
 crypto/src/asn1/Asn1OctetString.cs | 14 +++++++++++++-
 crypto/src/asn1/DerBitString.cs    | 18 ++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'crypto/src/asn1')

diff --git a/crypto/src/asn1/Asn1OctetString.cs b/crypto/src/asn1/Asn1OctetString.cs
index 8f7da8800..e52e50759 100644
--- a/crypto/src/asn1/Asn1OctetString.cs
+++ b/crypto/src/asn1/Asn1OctetString.cs
@@ -103,7 +103,19 @@ namespace Org.BouncyCastle.Asn1
             return contents;
         }
 
-		protected override int Asn1GetHashCode()
+#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+        internal ReadOnlyMemory<byte> GetOctetsMemory()
+        {
+            return contents.AsMemory();
+        }
+
+        internal ReadOnlySpan<byte> GetOctetsSpan()
+        {
+            return contents.AsSpan();
+        }
+#endif
+
+        protected override int Asn1GetHashCode()
 		{
 			return Arrays.GetHashCode(GetOctets());
         }
diff --git a/crypto/src/asn1/DerBitString.cs b/crypto/src/asn1/DerBitString.cs
index 2712c3056..b929de357 100644
--- a/crypto/src/asn1/DerBitString.cs
+++ b/crypto/src/asn1/DerBitString.cs
@@ -195,6 +195,24 @@ namespace Org.BouncyCastle.Asn1
             return Arrays.CopyOfRange(contents, 1, contents.Length);
         }
 
+#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+        internal ReadOnlyMemory<byte> GetOctetsMemory()
+        {
+            if (contents[0] != 0)
+                throw new InvalidOperationException("attempt to get non-octet aligned data from BIT STRING");
+
+            return contents.AsMemory(1);
+        }
+
+        internal ReadOnlySpan<byte> GetOctetsSpan()
+        {
+            if (contents[0] != 0)
+                throw new InvalidOperationException("attempt to get non-octet aligned data from BIT STRING");
+
+            return contents.AsSpan(1);
+        }
+#endif
+
         public virtual byte[] GetBytes()
 		{
             if (contents.Length == 1)
-- 
cgit 1.4.1