1 files changed, 9 insertions, 69 deletions
diff --git a/crypto/src/asn1/DLSet.cs b/crypto/src/asn1/DLSet.cs
index 7dcac25c2..ba55be826 100644
--- a/crypto/src/asn1/DLSet.cs
+++ b/crypto/src/asn1/DLSet.cs
@@ -12,8 +12,6 @@ namespace Org.BouncyCastle.Asn1
             return elementVector.Count < 1 ? Empty : new DLSet(elementVector);
         }
 
-        private int m_contentsLengthDL = -1;
-
         /**
          * create an empty set
          */
@@ -48,80 +46,22 @@ namespace Org.BouncyCastle.Asn1
         {
         }
 
-        internal override int EncodedLength(int encoding, bool withID)
+        internal override IAsn1Encoding GetEncoding(int encoding)
         {
             if (Asn1OutputStream.EncodingDer == encoding)
-                return base.EncodedLength(encoding, withID);
-
-            // TODO[asn1] Force DL encoding when supported
-            //encoding = Asn1OutputStream.EncodingDL;
-
-            int count = elements.Length;
-            int contentsLength = 0;
-
-            for (int i = 0; i < count; ++i)
-            {
-                Asn1Object asn1Object = elements[i].ToAsn1Object();
-                contentsLength += asn1Object.EncodedLength(encoding, true);
-            }
+                return base.GetEncoding(encoding);
 
-            return Asn1OutputStream.GetLengthOfEncodingDL(withID, contentsLength);
+            return new ConstructedDLEncoding(Asn1Tags.Universal, Asn1Tags.Set,
+                Asn1OutputStream.GetContentsEncodings(encoding, elements));
         }
 
-        internal override void Encode(Asn1OutputStream asn1Out, bool withID)
+        internal override IAsn1Encoding GetEncodingImplicit(int encoding, int tagClass, int tagNo)
         {
-            if (Asn1OutputStream.EncodingDer == asn1Out.Encoding)
-            {
-                base.Encode(asn1Out, withID);
-                return;
-            }
-
-            // TODO[asn1] Force DL encoding when supported
-            //asn1Out = asn1Out.GetDLSubStream();
-
-            asn1Out.WriteIdentifier(withID, Asn1Tags.Constructed | Asn1Tags.Set);
-
-            int count = elements.Length;
-            if (m_contentsLengthDL >= 0 || count > 16)
-            {
-                asn1Out.WriteDL(GetContentsLengthDL());
-
-                for (int i = 0; i < count; ++i)
-                {
-                    Asn1Object asn1Object = elements[i].ToAsn1Object();
-                    asn1Object.Encode(asn1Out, true);
-                }
-            }
-            else
-            {
-                int contentsLength = 0;
-
-                Asn1Object[] asn1Objects = new Asn1Object[count];
-                for (int i = 0; i < count; ++i)
-                {
-                    Asn1Object asn1Object = elements[i].ToAsn1Object();
-                    asn1Objects[i] = asn1Object;
-                    contentsLength += asn1Object.EncodedLength(asn1Out.Encoding, true);
-                }
-
-                this.m_contentsLengthDL = contentsLength;
-                asn1Out.WriteDL(contentsLength);
-
-                for (int i = 0; i < count; ++i)
-                {
-                    asn1Objects[i].Encode(asn1Out, true);
-                }
-            }
-        }
+            if (Asn1OutputStream.EncodingDer == encoding)
+                return base.GetEncodingImplicit(encoding, tagClass, tagNo);
 
-        private int GetContentsLengthDL()
-        {
-            if (m_contentsLengthDL < 0)
-            {
-                // TODO[asn1] Use DL encoding when supported
-                m_contentsLengthDL = CalculateContentsLength(Asn1OutputStream.EncodingBer);
-            }
-            return m_contentsLengthDL;
+            return new ConstructedDLEncoding(tagClass, tagNo,
+                Asn1OutputStream.GetContentsEncodings(encoding, elements));
         }
     }
 }