Merge 9cb2797 into d61ed6e

CityOfZion · Mar 21, 2019 · 7a1fba5 · 7a1fba5
2 parents d61ed6e + 9cb2797
commit 7a1fba5
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/neocore/Cryptography/Crypto.py b/neocore/Cryptography/Crypto.py
@@ -112,6 +112,7 @@ def Sign(message, private_key):
         Returns:
             bytearray: the signature of the message.
         """
+        Crypto.SetupSignatureCurve()
 
         hash = hashlib.sha256(binascii.unhexlify(message)).hexdigest()
 

diff --git a/tests/test_cryptography.py b/tests/test_cryptography.py
@@ -265,3 +265,40 @@ def test_faulty_message_param_to_verify_signature(self):
 
         result = Crypto.VerifySignature(faulty_message, fake_signature, fake_pubkey)
         self.assertFalse(result)
+
+
+class TestSigningWithoutCryptoInstance(TestCase):
+    def setUp(self):
+        import bitcoin
+        # reset Elliptic curve parameters to secp256k1
+        bitcoin.change_curve(bitcoin.P, bitcoin.N, bitcoin.A, bitcoin.B, bitcoin.Gx, bitcoin.Gy)
+
+    sig1 = None
+
+    def test_normal_signing(self):
+        # test the normal order of operations: Keypair will initialize secp256r1 Elliptic curve parameters
+        message = binascii.hexlify(b'Hello World')
+        key = KeyPair(bytes.fromhex('8631cd2635c416ba5f043561e9d2ff40b79c3bb2eb245e176615298b8372d0a4'))
+        signature = Crypto.Sign(message, '8631cd2635c416ba5f043561e9d2ff40b79c3bb2eb245e176615298b8372d0a4')
+
+        self.assertTrue(Crypto.VerifySignature(message, signature, key.PublicKey))
+        TestSigningWithoutCryptoInstance.sig1 = signature.hex()
+
+    def tearDown(self):
+        import bitcoin
+        # reset Elliptic curve parameters to secp256k1
+        bitcoin.change_curve(bitcoin.P, bitcoin.N, bitcoin.A, bitcoin.B, bitcoin.Gx, bitcoin.Gy)
+
+    sig2 = None
+
+    def test_signing_without_cyptoinstance(self):
+        # test signing prior to initializing secp256r1 Elliptic curve parameters with Keypair
+        message = binascii.hexlify(b'Hello World')
+        signature = Crypto.Sign(message, '8631cd2635c416ba5f043561e9d2ff40b79c3bb2eb245e176615298b8372d0a4')
+        key = KeyPair(bytes.fromhex('8631cd2635c416ba5f043561e9d2ff40b79c3bb2eb245e176615298b8372d0a4'))
+
+        self.assertTrue(Crypto.VerifySignature(message, signature, key.PublicKey))
+        TestSigningWithoutCryptoInstance.sig2 = signature.hex()
+
+        # ensure the signatures are identical
+        self.assertEqual(TestSigningWithoutCryptoInstance.sig1, TestSigningWithoutCryptoInstance.sig2)