Changeset 2359

Timestamp:

11/7/2011 6:58:02 AM (19 months ago)

Author:

lowjoel

Message:

As far as the Plugins assembly is concerned, settings in the ManagerLibrary? are out of reach. The ManagerLibrary? will have to be the glue which pushes settings from the user to the Plugins.

As such, the PrngRegistrar? class will have internal methods to set the acting PRNG's GUID.

Location:

branches/eraser6/pluginsRewrite/Eraser.Plugins

Files:

• ExtensionPoints/ErasureMethod.cs (modified) (1 diff)
• ExtensionPoints/FileSystem.cs (modified) (3 diffs)
• Registrars/PrngRegistrar.cs (modified) (2 diffs)

branches/eraser6/pluginsRewrite/Eraser.Plugins/ExtensionPoints/ErasureMethod.cs

@@ -128 +128 @@
 
             //Randomize.
-            Prng rand = Host.Instance.Prngs[ManagerLibrary.Settings.ActivePrng];
+            Prng rand = Host.Instance.Prngs.ActivePrng;
             for (int i = 0; i < result.Length; ++i)
             {

branches/eraser6/pluginsRewrite/Eraser.Plugins/ExtensionPoints/FileSystem.cs

@@ -47 +47 @@
         {
             //Get the PRNG we are going to use
-            Prng prng = Host.Instance.Prngs[ManagerLibrary.Settings.ActivePrng];
+            Prng prng = Host.Instance.Prngs.ActivePrng;
 
             //Initialsie the base name, if any.
@@ -110 +110 @@
 
             //Find a random entry.
-            Prng prng = Host.Instance.Prngs[ManagerLibrary.Settings.ActivePrng];
+            Prng prng = Host.Instance.Prngs.ActivePrng;
             string result = string.Empty;
             while (result.Length == 0)
@@ -136 +136 @@
                 List<string> entries = new List<string>(
                     ManagerLibrary.Settings.PlausibleDeniabilityFiles);
-                Prng prng = Host.Instance.Prngs[ManagerLibrary.Settings.ActivePrng];
+                Prng prng = Host.Instance.Prngs.ActivePrng;
                 do
                 {

branches/eraser6/pluginsRewrite/Eraser.Plugins/Registrars/PrngRegistrar.cs

@@ -42 +42 @@
 
         /// <summary>
+        /// Gets the PRNG that is active.
+        /// </summary>
+        /// <remarks>Client code should set the <see cref="ActivePrngGuid"/>
+        /// member.</remarks>
+        public Prng ActivePrng
+        {
+            get
+            {
+                return this[ActivePrngGuid];
+            }
+        }
+
+        /// <summary>
+        /// Sets the GUID of the active PRNG.
+        /// </summary>
+        private Guid ActivePrngGuid
+        {
+            get;
+            internal set;
+        }
+
+        /// <summary>
         /// Allows the EntropyThread to get entropy to the PRNG functions as seeds.
         /// </summary>
@@ -47 +69 @@
         internal void AddEntropy(byte[] entropy)
         {
-            lock (ManagerLibrary.Instance.PrngRegistrar)
-                foreach (Prng prng in ManagerLibrary.Instance.PrngRegistrar)
+            lock (Host.Instance.Prngs)
+                foreach (Prng prng in Host.Instance.Prngs)
                     prng.Reseed(entropy);
-        }
-
-        /// <summary>
-        /// Gets entropy from the EntropyThread.
-        /// </summary>
-        /// <returns>A buffer of arbitrary length containing random information.</returns>
-        internal static byte[] GetEntropy()
-        {
-            return ManagerLibrary.Instance.EntropySourceRegistrar.Poller.GetPool();
         }
     }