1 files changed, 0 insertions, 109 deletions
diff --git a/OpenSim.Framework/Remoting.cs b/OpenSim.Framework/Remoting.cs
deleted file mode 100644
index 1212ee5..0000000
--- a/OpenSim.Framework/Remoting.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Security.Cryptography;
-namespace OpenSim.Framework
-{
-    /// <summary>
-    /// NEEDS AUDIT.
-    /// </summary>
-    /// <remarks>
-    /// Suggested implementation
-    /// <para>Store two digests for each foreign host. A local copy of the local hash using the local challenge (when issued), and a local copy of the remote hash using the remote challenge.</para>
-    /// <para>When sending data to the foreign host - run 'Sign' on the data and affix the returned byte[] to the message.</para>
-    /// <para>When recieving data from the foreign host - run 'Authenticate' against the data and the attached byte[].</para>
-    /// <para>Both hosts should be performing these operations for this to be effective.</para>
-    /// </remarks>
-    class RemoteDigest
-    {
-        private byte[] currentHash;
-        private byte[] secret;
-        private SHA512Managed SHA512;
-        /// <summary>
-        /// Initialises a new RemoteDigest authentication mechanism
-        /// </summary>
-        /// <remarks>Needs an audit by a cryptographic professional - was not "roll your own"'d by choice but rather a serious lack of decent authentication mechanisms in .NET remoting</remarks>
-        /// <param name="sharedSecret">The shared secret between systems (for inter-sim, this is provided in encrypted form during connection, for grid this is input manually in setup)</param>
-        /// <param name="salt">Binary salt - some common value - to be decided what</param>
-        /// <param name="challenge">The challenge key provided by the third party</param>
-        public RemoteDigest(string sharedSecret, byte[] salt, string challenge)
-        {
-            SHA512 = new SHA512Managed();
-            Rfc2898DeriveBytes RFC2898 = new Rfc2898DeriveBytes(sharedSecret,salt);
-            secret = RFC2898.GetBytes(512);
-            ASCIIEncoding ASCII = new ASCIIEncoding();
-            currentHash = SHA512.ComputeHash(AppendArrays(secret, ASCII.GetBytes(challenge)));
-        }
-        /// <summary>
-        /// Authenticates a piece of incoming data against the local digest. Upon successful authentication, digest string is incremented.
-        /// </summary>
-        /// <param name="data">The incoming data</param>
-        /// <param name="digest">The remote digest</param>
-        /// <returns></returns>
-        public bool Authenticate(byte[] data, byte[] digest)
-        {
-            byte[] newHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));
-            if (digest == newHash)
-            {
-                currentHash = newHash;
-                return true;
-            }
-            else
-            {
-                throw new Exception("Hash comparison failed. Key resync required.");
-            }
-        }
-        /// <summary>
-        /// Signs a new bit of data with the current hash. Returns a byte array which should be affixed to the message.
-        /// Signing a piece of data will automatically increment the hash - if you sign data and do not send it, the 
-        /// hashes will get out of sync and throw an exception when validation is attempted.
-        /// </summary>
-        /// <param name="data">The outgoing data</param>
-        /// <returns>The local digest</returns>
-        public byte[] Sign(byte[] data)
-        {
-            currentHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));
-            return currentHash;
-        }
-        /// <summary>
-        /// Generates a new challenge string to be issued to a foreign host. Challenges are 1024-bit (effective strength of less than 512-bits) messages generated using the Crytographic Random Number Generator.
-        /// </summary>
-        /// <returns>A 128-character hexadecimal string containing the challenge.</returns>
-        public static string GenerateChallenge()
-        {
-            RNGCryptoServiceProvider RNG = new RNGCryptoServiceProvider();
-            byte[] bytes = new byte[64];
-            RNG.GetBytes(bytes);
-            StringBuilder sb = new StringBuilder(bytes.Length * 2);
-            foreach (byte b in bytes)
-            {
-                sb.AppendFormat("{0:x2}", b);
-            }
-            return sb.ToString();
-        }
-        /// <summary>
-        /// Helper function, merges two byte arrays
-        /// </summary>
-        /// <remarks>Sourced from MSDN Forum</remarks>
-        /// <param name="a">A</param>
-        /// <param name="b">B</param>
-        /// <returns>C</returns>
-        private byte[] AppendArrays(byte[] a, byte[] b)
-        {
-            byte[] c = new byte[a.Length + b.Length];
-            Buffer.BlockCopy(a, 0, c, 0, a.Length);
-            Buffer.BlockCopy(b, 0, c, a.Length, b.Length);
-            return c;
-        }
-    }
-}

diff --git a/OpenSim.Framework/Remoting.cs b/OpenSim.Framework/Remoting.cs deleted file mode 100644 index 1212ee5..0000000 --- a/OpenSim.Framework/Remoting.cs +++ /dev/null
@@ -1,109 +0,0 @@
1	using System;
2	using System.Collections.Generic;
3	using System.Text;
4	using System.Security.Cryptography;
5
6	namespace OpenSim.Framework
7	{
8	/// <summary>
9	/// NEEDS AUDIT.
10	/// </summary>
11	/// <remarks>
12	/// Suggested implementation
13	/// <para>Store two digests for each foreign host. A local copy of the local hash using the local challenge (when issued), and a local copy of the remote hash using the remote challenge.</para>
14	/// <para>When sending data to the foreign host - run 'Sign' on the data and affix the returned byte[] to the message.</para>
15	/// <para>When recieving data from the foreign host - run 'Authenticate' against the data and the attached byte[].</para>
16	/// <para>Both hosts should be performing these operations for this to be effective.</para>
17	/// </remarks>
18	class RemoteDigest
19	{
20	private byte[] currentHash;
21	private byte[] secret;
22
23	private SHA512Managed SHA512;
24
25	/// <summary>
26	/// Initialises a new RemoteDigest authentication mechanism
27	/// </summary>
28	/// <remarks>Needs an audit by a cryptographic professional - was not "roll your own"'d by choice but rather a serious lack of decent authentication mechanisms in .NET remoting</remarks>
29	/// <param name="sharedSecret">The shared secret between systems (for inter-sim, this is provided in encrypted form during connection, for grid this is input manually in setup)</param>
30	/// <param name="salt">Binary salt - some common value - to be decided what</param>
31	/// <param name="challenge">The challenge key provided by the third party</param>
32	public RemoteDigest(string sharedSecret, byte[] salt, string challenge)
33	{
34	SHA512 = new SHA512Managed();
35	Rfc2898DeriveBytes RFC2898 = new Rfc2898DeriveBytes(sharedSecret,salt);
36	secret = RFC2898.GetBytes(512);
37	ASCIIEncoding ASCII = new ASCIIEncoding();
38
39	currentHash = SHA512.ComputeHash(AppendArrays(secret, ASCII.GetBytes(challenge)));
40	}
41
42	/// <summary>
43	/// Authenticates a piece of incoming data against the local digest. Upon successful authentication, digest string is incremented.
44	/// </summary>
45	/// <param name="data">The incoming data</param>
46	/// <param name="digest">The remote digest</param>
47	/// <returns></returns>
48	public bool Authenticate(byte[] data, byte[] digest)
49	{
50	byte[] newHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));
51	if (digest == newHash)
52	{
53	currentHash = newHash;
54	return true;
55	}
56	else
57	{
58	throw new Exception("Hash comparison failed. Key resync required.");
59	}
60	}
61
62	/// <summary>
63	/// Signs a new bit of data with the current hash. Returns a byte array which should be affixed to the message.
64	/// Signing a piece of data will automatically increment the hash - if you sign data and do not send it, the
65	/// hashes will get out of sync and throw an exception when validation is attempted.
66	/// </summary>
67	/// <param name="data">The outgoing data</param>
68	/// <returns>The local digest</returns>
69	public byte[] Sign(byte[] data)
70	{
71	currentHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));
72	return currentHash;
73	}
74
75	/// <summary>
76	/// Generates a new challenge string to be issued to a foreign host. Challenges are 1024-bit (effective strength of less than 512-bits) messages generated using the Crytographic Random Number Generator.
77	/// </summary>
78	/// <returns>A 128-character hexadecimal string containing the challenge.</returns>
79	public static string GenerateChallenge()
80	{
81	RNGCryptoServiceProvider RNG = new RNGCryptoServiceProvider();
82	byte[] bytes = new byte[64];
83	RNG.GetBytes(bytes);
84
85	StringBuilder sb = new StringBuilder(bytes.Length * 2);
86	foreach (byte b in bytes)
87	{
88	sb.AppendFormat("{0:x2}", b);
89	}
90	return sb.ToString();
91	}
92
93	/// <summary>
94	/// Helper function, merges two byte arrays
95	/// </summary>
96	/// <remarks>Sourced from MSDN Forum</remarks>
97	/// <param name="a">A</param>
98	/// <param name="b">B</param>
99	/// <returns>C</returns>
100	private byte[] AppendArrays(byte[] a, byte[] b)
101	{
102	byte[] c = new byte[a.Length + b.Length];
103	Buffer.BlockCopy(a, 0, c, 0, a.Length);
104	Buffer.BlockCopy(b, 0, c, a.Length, b.Length);
105	return c;
106	}
107
108	}
109	}