-
Notifications
You must be signed in to change notification settings - Fork 309
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
273 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| """ | ||
| Common functions for providing cross-python version compatibility. | ||
| """ | ||
| import sys | ||
|
|
||
|
|
||
| if sys.version_info < (3, 0): | ||
| def normalise_bytes(buffer_object): | ||
| """Cast the input into array of bytes.""" | ||
| return buffer(buffer_object) | ||
|
|
||
|
|
||
| else: | ||
| def normalise_bytes(buffer_object): | ||
| """Cast the input into array of bytes.""" | ||
| return memoryview(buffer_object).cast('B') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,218 @@ | ||
| try: | ||
| import unittest2 as unittest | ||
| except ImportError: | ||
| import unittest | ||
|
|
||
| try: | ||
| buffer | ||
| except NameError: | ||
| buffer = memoryview | ||
|
|
||
| import array | ||
| import six | ||
| import sys | ||
| import pytest | ||
| import hashlib | ||
|
|
||
| from .keys import VerifyingKey, SigningKey | ||
| from .der import unpem | ||
| from .util import sigencode_string, sigencode_der, sigencode_strings, \ | ||
| sigdecode_string, sigdecode_der, sigdecode_strings | ||
|
|
||
|
|
||
| class TestVerifyingKeyFromString(unittest.TestCase): | ||
| """ | ||
| Verify that ecdsa.keys.VerifyingKey.from_string() can be used with | ||
| bytes-like objects | ||
| """ | ||
|
|
||
| @classmethod | ||
| def setUpClass(cls): | ||
| cls.key_bytes = (b'\x04L\xa2\x95\xdb\xc7Z\xd7\x1f\x93\nz\xcf\x97\xcf' | ||
| b'\xd7\xc2\xd9o\xfe8}X!\xae\xd4\xfah\xfa^\rpI\xba\xd1' | ||
| b'Y\xfb\x92xa\xebo+\x9cG\xfav\xca') | ||
| cls.vk = VerifyingKey.from_string(cls.key_bytes) | ||
|
|
||
| def test_bytes(self): | ||
| self.assertIsNotNone(self.vk) | ||
| self.assertIsInstance(self.vk, VerifyingKey) | ||
| self.assertEqual( | ||
| self.vk.pubkey.point.x(), | ||
| 105419898848891948935835657980914000059957975659675736097) | ||
| self.assertEqual( | ||
| self.vk.pubkey.point.y(), | ||
| 4286866841217412202667522375431381222214611213481632495306) | ||
|
|
||
| def test_bytes_memoryview(self): | ||
| vk = VerifyingKey.from_string(buffer(self.key_bytes)) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_bytearray(self): | ||
| vk = VerifyingKey.from_string(bytearray(self.key_bytes)) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_bytesarray_memoryview(self): | ||
| vk = VerifyingKey.from_string(buffer(bytearray(self.key_bytes))) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_array_array_of_bytes(self): | ||
| arr = array.array('B', self.key_bytes) | ||
| vk = VerifyingKey.from_string(arr) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_array_array_of_bytes_memoryview(self): | ||
| arr = array.array('B', self.key_bytes) | ||
| vk = VerifyingKey.from_string(buffer(arr)) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_array_array_of_ints(self): | ||
| arr = array.array('I', self.key_bytes) | ||
| vk = VerifyingKey.from_string(arr) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_array_array_of_ints_memoryview(self): | ||
| arr = array.array('I', self.key_bytes) | ||
| vk = VerifyingKey.from_string(buffer(arr)) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_bytes_uncompressed(self): | ||
| vk = VerifyingKey.from_string(b'\x04' + self.key_bytes) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_bytearray_uncompressed(self): | ||
| vk = VerifyingKey.from_string(bytearray(b'\x04' + self.key_bytes)) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_bytes_compressed(self): | ||
| vk = VerifyingKey.from_string(b'\x02' + self.key_bytes[:24]) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_bytearray_uncompressed(self): | ||
| vk = VerifyingKey.from_string(bytearray(b'\x02' + self.key_bytes[:24])) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
|
|
||
| class TestVerifyingKeyFromDer(unittest.TestCase): | ||
| """ | ||
| Verify that ecdsa.keys.VerifyingKey.from_der() can be used with | ||
| bytes-like objects. | ||
| """ | ||
| @classmethod | ||
| def setUpClass(cls): | ||
| prv_key_str = ( | ||
| "-----BEGIN EC PRIVATE KEY-----\n" | ||
| "MF8CAQEEGF7IQgvW75JSqULpiQQ8op9WH6Uldw6xxaAKBggqhkjOPQMBAaE0AzIA\n" | ||
| "BLiBd9CE7xf15FY5QIAoNg+fWbSk1yZOYtoGUdzkejWkxbRc9RWTQjqLVXucIJnz\n" | ||
| "bA==\n" | ||
| "-----END EC PRIVATE KEY-----\n") | ||
| key_str = ( | ||
| "-----BEGIN PUBLIC KEY-----\n" | ||
| "MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEuIF30ITvF/XkVjlAgCg2D59ZtKTX\n" | ||
| "Jk5i2gZR3OR6NaTFtFz1FZNCOotVe5wgmfNs\n" | ||
| "-----END PUBLIC KEY-----\n") | ||
| cls.key_bytes = unpem(key_str) | ||
| assert isinstance(cls.key_bytes, bytes) | ||
| cls.vk = VerifyingKey.from_pem(key_str) | ||
|
|
||
| def test_bytes(self): | ||
| vk = VerifyingKey.from_der(self.key_bytes) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_bytes_memoryview(self): | ||
| vk = VerifyingKey.from_der(buffer(self.key_bytes)) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_bytearray(self): | ||
| vk = VerifyingKey.from_der(bytearray(self.key_bytes)) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_bytesarray_memoryview(self): | ||
| vk = VerifyingKey.from_der(buffer(bytearray(self.key_bytes))) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_array_array_of_bytes(self): | ||
| arr = array.array('B', self.key_bytes) | ||
| vk = VerifyingKey.from_der(arr) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
| def test_array_array_of_bytes_memoryview(self): | ||
| arr = array.array('B', self.key_bytes) | ||
| vk = VerifyingKey.from_der(buffer(arr)) | ||
|
|
||
| self.assertEqual(self.vk.to_string(), vk.to_string()) | ||
|
|
||
|
|
||
| # test VerifyingKey.verify() | ||
| prv_key_str = ( | ||
| "-----BEGIN EC PRIVATE KEY-----\n" | ||
| "MF8CAQEEGF7IQgvW75JSqULpiQQ8op9WH6Uldw6xxaAKBggqhkjOPQMBAaE0AzIA\n" | ||
| "BLiBd9CE7xf15FY5QIAoNg+fWbSk1yZOYtoGUdzkejWkxbRc9RWTQjqLVXucIJnz\n" | ||
| "bA==\n" | ||
| "-----END EC PRIVATE KEY-----\n") | ||
| key_bytes = unpem(prv_key_str) | ||
| assert isinstance(key_bytes, bytes) | ||
| sk = SigningKey.from_der(key_bytes) | ||
| vk = sk.verifying_key | ||
|
|
||
| data = (b"some string for signing" | ||
| b"contents don't really matter" | ||
| b"but do include also some crazy values: " | ||
| b"\x00\x01\t\r\n\x00\x00\x00\x00\xff\xf0") | ||
| sha1 = hashlib.sha1() | ||
| sha1.update(data) | ||
| data_hash = sha1.digest() | ||
|
|
||
| sig_raw = sk.sign(data, sigencode=sigencode_string) | ||
| assert isinstance(sig_raw, bytes) | ||
| sig_der = sk.sign(data, sigencode=sigencode_der) | ||
| assert isinstance(sig_der, bytes) | ||
| sig_strings = sk.sign(data, sigencode=sigencode_strings) | ||
| assert isinstance(sig_strings[0], bytes) | ||
|
|
||
| verifiers = [] | ||
| for modifier, fun in [ | ||
| ("bytes", lambda x: x), | ||
| ("bytes memoryview", lambda x: buffer(x)), | ||
| ("bytearray", lambda x: bytearray(x)), | ||
| ("bytearray memoryview", lambda x: buffer(bytearray(x))), | ||
| ("array.array of bytes", lambda x: array.array('B', x)), | ||
| ("array.array of bytes memoryview", lambda x: buffer(array.array('B', x))) | ||
| ]: | ||
| for sig_format, signature, decoder, mod_apply in [ | ||
| ("raw", sig_raw, sigdecode_string, lambda x: fun(x)), | ||
| ("der", sig_der, sigdecode_der, lambda x: fun(x)), | ||
| ("strings", sig_strings, sigdecode_strings, lambda x: | ||
| tuple(fun(i) for i in x)) | ||
| ]: | ||
| for method_name, vrf_mthd, vrf_data in [ | ||
| ("verify", vk.verify, data), | ||
| ("verify_digest", vk.verify_digest, data_hash) | ||
| ]: | ||
| verifiers.append(pytest.param( | ||
| signature, decoder, mod_apply, fun, vrf_mthd, vrf_data, | ||
| id="{2}-{0}-{1}".format(modifier, sig_format, method_name))) | ||
|
|
||
| @pytest.mark.parametrize( | ||
| "signature,decoder,mod_apply,fun,vrf_mthd,vrf_data", | ||
| verifiers) | ||
| def test_VerifyingKey_verify( | ||
| signature, decoder, mod_apply, fun, vrf_mthd, vrf_data): | ||
| sig = mod_apply(signature) | ||
|
|
||
| assert vrf_mthd(sig, fun(vrf_data), sigdecode=decoder) |
Oops, something went wrong.