X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FHash160.cs;h=f95165bc4b8fc72ba845311079122e2175e32ea9;hb=1f6b6ffe24de703593f20f5f881a2e797473621c;hp=4b99ea0a633f0aa3b8b495c166accfad2aaaf00f;hpb=ed406332056a475608c5c2b25725e61dd0194231;p=NovacoinLibrary.git

diff --git a/Novacoin/Hash160.cs b/Novacoin/Hash160.cs
index 4b99ea0..f95165b 100644
--- a/Novacoin/Hash160.cs
+++ b/Novacoin/Hash160.cs
@@ -1,37 +1,60 @@
-using System;
-using System.Security.Cryptography;
-using System.Collections.Generic;
-using System.Text;
+/**
+ *  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.Linq;
+using Org.BouncyCastle.Crypto.Digests;
 
 namespace Novacoin
 {
-	/// <summary>
-	/// Representation of pubkey/script hash.
-	/// </summary>
-	public class Hash160 : Hash
+    /// <summary>
+    /// Representation of pubkey/script hash.
+    /// </summary>
+    public class Hash160 : Hash
 	{
         /// <summary>
         /// Computes RIPEMD160 hash using managed library
         /// </summary>
-        private static readonly RIPEMD160Managed _hasher160 = new RIPEMD160Managed();
-        
+        //private static readonly RIPEMD160Managed _hasher160 = new RIPEMD160Managed();
+
+        private static RipeMD160Digest _hasher160 = new RipeMD160Digest();
+        private static Sha256Digest _hasher256 = new Sha256Digest();
+
         // 20 bytes
         public override int hashSize
         {
-            get { return 20; }
+            get { return _hasher160.GetDigestSize(); }
         }
 
         public Hash160() : base() { }
         public Hash160(byte[] bytes, int offset = 0) : base(bytes, offset) { }
-        public Hash160(IEnumerable<byte> bytes, int skip = 0) : base(bytes, skip) { }
         public Hash160(Hash160 h) : base(h) { }
 
-        public static Hash160 Compute160(IEnumerable<byte> inputBytes)
+        public static Hash160 Compute160(byte[] inputBytes)
         {
-            byte[] dataBytes = inputBytes.ToArray();
-            byte[] digest1 = _hasher256.ComputeHash(dataBytes, 0, dataBytes.Length);
-            byte[] digest2 = _hasher160.ComputeHash(digest1, 0, digest1.Length);
+            var dataBytes = inputBytes.ToArray();
+
+			var digest1 = new byte[_hasher256.GetDigestSize()];
+			var digest2 = new byte[_hasher160.GetDigestSize()];
+
+            _hasher256.BlockUpdate(dataBytes, 0, dataBytes.Length);
+            _hasher256.DoFinal(digest1, 0);
+            _hasher160.BlockUpdate(digest1, 0, digest1.Length);
+            _hasher160.DoFinal(digest2, 0);
 
             return new Hash160(digest2);
         }