ASN.1: Staged encoding

1 files changed, 7 insertions, 7 deletions

diff --git a/crypto/src/asn1/DerBMPString.cs b/crypto/src/asn1/DerBMPString.cs
index d3c7b3b46..4e35dfff8 100644
--- a/crypto/src/asn1/DerBMPString.cs
+++ b/crypto/src/asn1/DerBMPString.cs
@@ -111,28 +111,28 @@ namespace Org.BouncyCastle.Asn1
 			return this.str.Equals(other.str);
         }
 
-        internal override bool EncodeConstructed(int encoding)
+        internal override IAsn1Encoding GetEncoding(int encoding)
         {
-            return false;
+            return new PrimitiveEncoding(Asn1Tags.Universal, Asn1Tags.BmpString, GetContents());
         }
 
-        internal override int EncodedLength(int encoding, bool withID)
+        internal override IAsn1Encoding GetEncodingImplicit(int encoding, int tagClass, int tagNo)
         {
-            return Asn1OutputStream.GetLengthOfEncodingDL(withID, str.Length * 2);
+            return new PrimitiveEncoding(tagClass, tagNo, GetContents());
         }
 
-		internal override void Encode(Asn1OutputStream asn1Out, bool withID)
+        private byte[] GetContents()
         {
             char[] c = str.ToCharArray();
             byte[] b = new byte[c.Length * 2];
 
-			for (int i = 0; i != c.Length; i++)
+            for (int i = 0; i != c.Length; i++)
             {
                 b[2 * i] = (byte)(c[i] >> 8);
                 b[2 * i + 1] = (byte)c[i];
             }
 
-            asn1Out.WriteEncodingDL(withID, Asn1Tags.BmpString, b);
+            return b;
         }
     }
 }