Add ArgumentException for incorrect private key
[NovacoinLibrary.git] / Novacoin / CKeyPair.cs
index c47e7eb..6f6cbe1 100644 (file)
@@ -1,35 +1,78 @@
-\feffusing System.Collections.Generic;
-using System.Linq;
-using System;
+\feff/**
+ *  Novacoin classes library
+ *  Copyright (C) 2015 Alex D. (balthazar.ad@gmail.com)
 
-using Org.BouncyCastle.Math;
-using Org.BouncyCastle.Math.EC;
+ *  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 Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Generators;
+
+using System.Security.Cryptography;
+
 using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Security;
-
+using System.Collections.Generic;
+using System.Linq;
+using System;
 
 namespace Novacoin
 {
     public class CKeyPair : CKey
     {
         private ECPrivateKeyParameters _Private;
+        private RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider();
 
         /// <summary>
         /// Initialize new CKeyPair instance with random secret.
         /// </summary>
-        public CKeyPair(bool Compressed=true)
+        public CKeyPair(bool Compressed = true)
         {
-            ECKeyGenerationParameters genParams = new ECKeyGenerationParameters(domain, new SecureRandom());
-            ECKeyPairGenerator generator = new ECKeyPairGenerator("ECDSA");
+
+
+            var genParams = new ECKeyGenerationParameters(domain, new SecureRandom());
+            var generator = new ECKeyPairGenerator("ECDSA");
             generator.Init(genParams);
-            AsymmetricCipherKeyPair ecKeyPair = generator.GenerateKeyPair();
+            var ecKeyPair = generator.GenerateKeyPair();
 
             _Private = (ECPrivateKeyParameters)ecKeyPair.Private;
             _Public = (ECPublicKeyParameters)ecKeyPair.Public;
 
+            /*
+              BigInteger D;
+              var buffer1 = new byte[32];
+              var buffer2 = new byte[32];
+
+              do
+              {
+                  rng.GetBytes(buffer1);
+                  rng.GetNonZeroBytes(buffer2);
+
+                  D = new BigInteger(Hash256.ComputeRaw256(ref buffer1, ref buffer2));
+
+                  if (D.BitLength < 249)
+                      System.Console.WriteLine(D.BitLength);
+              }
+              while (D.SignValue == -1);
+
+              var Q = curve.G.Multiply(D);
+
+              _Private = new ECPrivateKeyParameters(D, domain);
+              _Public = new ECPublicKeyParameters(Q, domain);
+            */
+
             if (Compressed)
             {
                 _Public = Compress(_Public);
@@ -41,21 +84,26 @@ namespace Novacoin
         /// </summary>
         /// <param name="secretBytes">Byte sequence</param>
         /// <param name="Compressed">Compression flag</param>
-        public CKeyPair(IEnumerable<byte> secretBytes, bool Compressed=true)
+        public CKeyPair(byte[] secretBytes, bool Compressed=true)
         {
+            if (secretBytes.Length != 32)
+            {
+                throw new ArgumentException("Serialized secret key must be 32 bytes long.");
+            }
+
             // Deserialize secret value
-            BigInteger D = new BigInteger(secretBytes.Take(32).ToArray());
+            var D = new BigInteger(secretBytes);
 
+            // Append with zero byte if necessary
             if (D.SignValue == -1)
             {
-                List<byte> fixedKeyBytes = secretBytes.Take(32).ToList();
-                fixedKeyBytes.Insert(0, 0x00); // prepend with sign byte
-
-                D = new BigInteger(fixedKeyBytes.ToArray());
+                var positiveKeyBytes = new byte[33];
+                Array.Copy(secretBytes, 0, positiveKeyBytes, 1, 32);
+                D = new BigInteger(positiveKeyBytes);
             }
 
             // Calculate public key
-            ECPoint Q = curve.G.Multiply(D);
+            var Q = curve.G.Multiply(D);
 
             _Private = new ECPrivateKeyParameters(D, domain);
             _Public = new ECPublicKeyParameters(Q, domain);
@@ -70,34 +118,38 @@ namespace Novacoin
         /// Init key pair using secret sequence of bytes
         /// </summary>
         /// <param name="secretBytes">Byte sequence</param>
-        public CKeyPair(IEnumerable<byte> secretBytes) : 
-            this (secretBytes.Take(32), (secretBytes.Count() == 33 && secretBytes.Last() == 0x01))
+        public CKeyPair(byte[] secretBytes) : 
+            this (secretBytes.Take(32).ToArray(), (secretBytes.Count() == 33 && secretBytes.Last() == 0x01))
         {
         }
 
         public CKeyPair(string strBase58)
         {
-            List<byte> rawBytes = AddressTools.Base58DecodeCheck(strBase58).ToList();
-            rawBytes.RemoveAt(0); // Remove key version byte
+            var rawSecretBytes = AddressTools.Base58DecodeCheck(strBase58);
+
+            if (rawSecretBytes.Length > 34 || rawSecretBytes.Length < 33)
+            {
+                throw new ArgumentException("Though you have provided a correct Base58 representation of some data, this data doesn't represent a valid private key.");
+            }
 
             // Deserialize secret value
-            BigInteger D = new BigInteger(rawBytes.Take(32).ToArray());
+            var D = new BigInteger(rawSecretBytes.Skip(1).Take(32).ToArray());
 
             if (D.SignValue == -1)
             {
-                List<byte> secretbytes = rawBytes.Take(32).ToList(); // Copy secret
-                secretbytes.Insert(0, 0x00); // Prepend with sign byte
+                var secretBytes = new byte[33];
+                Array.Copy(rawSecretBytes, 1, secretBytes, 1, 32); // Copying the privkey, 32 bytes starting from second byte of array
 
-                D = new BigInteger(secretbytes.ToArray()); // Try decoding again
+                D = new BigInteger(secretBytes); // Try decoding again
             }
 
             // Calculate public key
-            ECPoint Q = curve.G.Multiply(D);
+            var Q = curve.G.Multiply(D);
 
             _Private = new ECPrivateKeyParameters(D, domain);
             _Public = new ECPublicKeyParameters(Q, domain);
 
-            if (rawBytes.Count == 33 && rawBytes.Last() == 0x01) // Check compression tag
+            if (rawSecretBytes.Length == 34 && rawSecretBytes.Last() == 0x01) // Check compression tag
             {
                 _Public = Compress(_Public);
             }
@@ -118,9 +170,9 @@ namespace Novacoin
         /// </summary>
         /// <param name="data">Hash to sigh</param>
         /// <returns>Signature bytes sequence</returns>
-        public IEnumerable<byte> Sign(Hash sigHash)
+        public byte[] Sign(Hash sigHash)
         {
-            ISigner signer = SignerUtilities.GetSigner("NONEwithECDSA");
+            var signer = SignerUtilities.GetSigner("NONEwithECDSA");
             signer.Init(true, _Private);
             signer.BlockUpdate(sigHash.hashBytes, 0, sigHash.hashSize);
 
@@ -135,13 +187,13 @@ namespace Novacoin
         /// <summary>
         /// SecretBytes part of key pair
         /// </summary>
-        public IEnumerable<byte> SecretBytes
+        public byte[] SecretBytes
         {
             get
             {
-                List<byte> secretBytes = new List<byte>(_Private.D.ToByteArray());
+                var secretBytes = new List<byte>(_Private.D.ToByteArray());
 
-                if (secretBytes[0] == 0x00)
+                if (secretBytes.Count == 33 && secretBytes[0] == 0x00)
                 {
                     // Remove sign
                     secretBytes.RemoveAt(0);
@@ -153,7 +205,7 @@ namespace Novacoin
                     secretBytes.Add(0x01);
                 }
 
-                return secretBytes;
+                return secretBytes.ToArray();
             }
         }
 
@@ -162,14 +214,18 @@ namespace Novacoin
             return Interop.ToHex(SecretBytes);
         }
 
+        /// <summary>
+        /// Generate Base58 string in wallet import format
+        /// </summary>
+        /// <returns></returns>
         public override string ToString()
         {
-            List<byte> r = new List<byte>();
+            var r = new List<byte>();
 
             r.Add((byte)(128 + AddrType.PUBKEY_ADDRESS)); // Key version
             r.AddRange(SecretBytes); // Key data
 
-            return AddressTools.Base58EncodeCheck(r);
+            return AddressTools.Base58EncodeCheck(r.ToArray());
         }
     }
 }