Sanity check in PrivateKey constructor using bytes

planetarium · Aug 15, 2019 · ef9b0e4 · ef9b0e4
1 parent b41da29
commit ef9b0e4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 5 deletions.
diff --git a/Libplanet.Tests/Crypto/PrivateKeyTest.cs b/Libplanet.Tests/Crypto/PrivateKeyTest.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Text;
 using Libplanet.Crypto;
 using Xunit;
@@ -20,6 +21,17 @@ public void BytesTest()
             Assert.Equal(bs, key.ByteArray);
         }
 
+        [Fact]
+        public void BytesSanityCheckTest()
+        {
+            var bs = new byte[]
+            {
+                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+            };
+            Assert.Throws<InvalidOperationException>(() => new PrivateKey(bs));
+        }
+
         [Fact]
         public void PublicKeyTest()
         {

diff --git a/Libplanet/Crypto/PrivateKey.cs b/Libplanet/Crypto/PrivateKey.cs
@@ -69,11 +69,7 @@ public PrivateKey()
         /// <seealso cref="ByteArray"/>
         public PrivateKey(byte[] privateKey)
             : this(
-                new ECPrivateKeyParameters(
-                    "ECDSA",
-                    new BigInteger(1, privateKey),
-                    GetECParameters()
-                )
+                GenerateKeyFromBytes(privateKey)
             )
         {
         }
@@ -269,6 +265,29 @@ private static ECPrivateKeyParameters GenerateKeyParam()
             return gen.GenerateKeyPair().Private as ECPrivateKeyParameters;
         }
 
+        private static ECPrivateKeyParameters GenerateKeyFromBytes(byte[] privateKey)
+        {
+            var param = new ECPrivateKeyParameters(
+                "ECDSA",
+                new BigInteger(1, privateKey),
+                GetECParameters()
+            );
+
+            var key = new PrivateKey(param);
+            try
+            {
+                var publicKey = key.PublicKey;
+            }
+            catch (ArgumentException)
+            {
+                throw new InvalidOperationException(
+                    "Infinity is not a valid public key for ECDH"
+                );
+            }
+
+            return param;
+        }
+
         private ECPoint CalculatePoint(ECPublicKeyParameters pubKeyParams)
         {
             ECDomainParameters dp = keyParam.Parameters;