From 56256b133d57fada6dd8997bd58c4d60ef97db3e Mon Sep 17 00:00:00 2001
From: David Hook <dgh@bouncycastle.org>
Date: Tue, 15 Jan 2019 05:05:09 +1100
Subject: moved ASN.1 class back

---
 crypto/src/asn1/crmf/Controls.cs | 55 ++++++++++++++++++++++++++++++++++++++++
 crypto/src/crmf/IControl.cs      | 49 -----------------------------------
 2 files changed, 55 insertions(+), 49 deletions(-)
 create mode 100644 crypto/src/asn1/crmf/Controls.cs

diff --git a/crypto/src/asn1/crmf/Controls.cs b/crypto/src/asn1/crmf/Controls.cs
new file mode 100644
index 000000000..5f132155a
--- /dev/null
+++ b/crypto/src/asn1/crmf/Controls.cs
@@ -0,0 +1,55 @@
+using Org.BouncyCastle.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Org.BouncyCastle.Asn1.Crmf
+{
+    public class Controls
+        : Asn1Encodable
+    {
+        private readonly Asn1Sequence content;
+
+        private Controls(Asn1Sequence seq)
+        {
+            content = seq;
+        }
+
+        public static Controls GetInstance(object obj)
+        {
+            if (obj is Controls)
+                return (Controls)obj;
+
+            if (obj is Asn1Sequence)
+                return new Controls((Asn1Sequence)obj);
+
+            throw new ArgumentException("Invalid object: " + Platform.GetTypeName(obj), "obj");
+        }
+
+        public Controls(params AttributeTypeAndValue[] atvs)
+        {
+            content = new DerSequence(atvs);
+        }
+
+        public virtual AttributeTypeAndValue[] ToAttributeTypeAndValueArray()
+        {
+            AttributeTypeAndValue[] result = new AttributeTypeAndValue[content.Count];
+            for (int i = 0; i != result.Length; ++i)
+            {
+                result[i] = AttributeTypeAndValue.GetInstance(content[i]);
+            }
+            return result;
+        }
+
+        /**
+         * <pre>
+         * Controls  ::= SEQUENCE SIZE(1..MAX) OF AttributeTypeAndValue
+         * </pre>
+         * @return a basic ASN.1 object representation.
+         */
+        public override Asn1Object ToAsn1Object()
+        {
+            return content;
+        }
+    }
+}
diff --git a/crypto/src/crmf/IControl.cs b/crypto/src/crmf/IControl.cs
index bf29fafdd..3601633a4 100644
--- a/crypto/src/crmf/IControl.cs
+++ b/crypto/src/crmf/IControl.cs
@@ -13,53 +13,4 @@ namespace Org.BouncyCastle.Crmf
 
         Asn1Encodable Value { get; }
     }
-
-
-    public class Controls
-        : Asn1Encodable
-    {
-        private readonly Asn1Sequence content;
-
-        private Controls(Asn1Sequence seq)
-        {
-            content = seq;
-        }
-
-        public static Controls GetInstance(object obj)
-        {
-            if (obj is Controls)
-                return (Controls)obj;
-
-            if (obj is Asn1Sequence)
-                return new Controls((Asn1Sequence)obj);
-
-            throw new ArgumentException("Invalid object: " + Platform.GetTypeName(obj), "obj");
-        }
-
-		public Controls(params AttributeTypeAndValue[] atvs)
-        {
-            content = new DerSequence(atvs);
-        }
-
-        public virtual AttributeTypeAndValue[] ToAttributeTypeAndValueArray()
-        {
-            AttributeTypeAndValue[] result = new AttributeTypeAndValue[content.Count];
-            for (int i = 0; i != result.Length; ++i)
-            {
-                result[i] = AttributeTypeAndValue.GetInstance(content[i]);
-            }
-            return result;
-        }
-
-        /**
-         * <pre>
-         * Controls  ::= SEQUENCE SIZE(1..MAX) OF AttributeTypeAndValue
-         * </pre>
-         * @return a basic ASN.1 object representation.
-         */
-        public override Asn1Object ToAsn1Object()
-        {
-            return content;
-        }
-    }
 }
-- 
cgit 1.4.1