ASN.1: Port of bc-java TYPE instances

- we use Meta.Instance here due to syntax restrictions
- also reworked some ASN.1 string types

1 files changed, 18 insertions, 3 deletions

diff --git a/crypto/src/asn1/DerBitString.cs b/crypto/src/asn1/DerBitString.cs
index 375abb479..4596fbbc8 100644
--- a/crypto/src/asn1/DerBitString.cs
+++ b/crypto/src/asn1/DerBitString.cs
@@ -11,7 +11,24 @@ namespace Org.BouncyCastle.Asn1
 	public class DerBitString
 		: DerStringBase
 	{
-		private static readonly char[] table
+        internal class Meta : Asn1UniversalType
+        {
+            internal static readonly Asn1UniversalType Instance = new Meta();
+
+            private Meta() : base(typeof(DerBitString), Asn1Tags.BitString) { }
+
+            internal override Asn1Object FromImplicitPrimitive(DerOctetString octetString)
+            {
+                return CreatePrimitive(octetString.GetOctets());
+            }
+
+            internal override Asn1Object FromImplicitConstructed(Asn1Sequence sequence)
+            {
+                return sequence.ToAsn1BitString();
+            }
+        }
+
+        private static readonly char[] table
 			= { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
 
         /**
@@ -323,9 +340,7 @@ namespace Org.BouncyCastle.Asn1
 
                 byte finalOctet = contents[length - 1];
                 if (finalOctet != (byte)(finalOctet & (0xFF << padBits)))
-                {
                     return new BerBitString(contents, false);
-                }
             }
 
             return new DerBitString(contents, false);