Complete implementation of uint256 and uint160 classes.

[NovacoinLibrary.git] / Novacoin / ScryptHash256.cs

diff --git a/Novacoin/ScryptHash256.cs b/Novacoin/ScryptHash256.cs
index da6c9cc..4f95926 100644 (file)
--- a/Novacoin/ScryptHash256.cs
+++ b/Novacoin/ScryptHash256.cs
@@ -1,22 +1,22 @@
 \feff/**
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  Novacoin classes library
+ *  Copyright (C) 2015 Alex D. (balthazar.ad@gmail.com)
+
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Novacoin
 {
@@ -33,7 +33,6 @@ namespace Novacoin
 
         public ScryptHash256() : base() { }
         public ScryptHash256(byte[] bytes, int offset = 0) : base(bytes, offset) { }
-        public ScryptHash256(IEnumerable<byte> bytes, int skip = 0) : base(bytes, skip) { }
         public ScryptHash256(ScryptHash256 h) : base(h) { }
 
         /// <summary>
@@ -41,33 +40,33 @@ namespace Novacoin
         /// </summary>
         /// <param name="inputBytes">Byte sequence to hash</param>
         /// <returns>Hashing result instance</returns>
-        public static ScryptHash256 Compute256(IEnumerable<byte> inputBytes)
+        public static ScryptHash256 Compute256(byte[] inputBytes)
         {
-            uint[] V = new uint[(131072 + 63) / sizeof(uint)];
+            var V = new uint[(131072 + 63) / sizeof(uint)];
 
-            byte[] dataBytes = inputBytes.ToArray();
-            byte[] keyBytes1 = CryptoUtils.PBKDF2_Sha256(128, dataBytes, dataBytes, 1);
-            uint[] X = Interop.ToUInt32Array(keyBytes1);
+            var keyBytes1 = CryptoUtils.PBKDF2_Sha256(128, (byte[])inputBytes, (byte[])inputBytes, 1);
+            var X = Interop.ToUInt32Array(keyBytes1);
 
-            uint i, j, k;
-            for (i = 0; i < 1024; i++)
+            for (var i = 0; i < 1024; i++)
             {
                 Array.Copy(X, 0, V, i * 32, 32);
 
                 xor_salsa8(ref X, 0, ref X, 16);
                 xor_salsa8(ref X, 16, ref X, 0);
             }
-            for (i = 0; i < 1024; i++)
+            for (var i = 0; i < 1024; i++)
             {
-                j = 32 * (X[16] & 1023);
-                for (k = 0; k < 32; k++)
+                var j = 32 * (X[16] & 1023);
+                for (var k = 0; k < 32; k++)
+                {
                     X[k] ^= V[j + k];
+                }
                 xor_salsa8(ref X, 0, ref X, 16);
                 xor_salsa8(ref X, 16, ref X, 0);
             }
 
-            byte[] xBytes = Interop.LEBytes(X);
-            byte[] keyBytes2 = CryptoUtils.PBKDF2_Sha256(32, dataBytes, xBytes, 1);
+            var xBytes = Interop.LEBytes(X);
+            var keyBytes2 = CryptoUtils.PBKDF2_Sha256(32, (byte[])inputBytes, xBytes, 1);
 
             return new ScryptHash256(keyBytes2);
         }