From 3fc686ea06d4c2dcaf6b363ec1c54a72d995df88 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 30 Apr 2014 09:07:27 -0500 Subject: dss_sig_value: Pure python conversion of (r, s) to byte stream --- tests/test_utils.py | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'tests/test_utils.py') diff --git a/tests/test_utils.py b/tests/test_utils.py index 7a0b9e74..7b3ffbc3 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -27,11 +27,11 @@ from cryptography.exceptions import UnsupportedAlgorithm, _Reasons import cryptography_vectors from .utils import ( - check_backend_support, check_for_iface, load_cryptrec_vectors, - load_fips_dsa_key_pair_vectors, load_fips_dsa_sig_vectors, - load_fips_ecdsa_key_pair_vectors, load_fips_ecdsa_signing_vectors, - load_hash_vectors, load_nist_vectors, load_pkcs1_vectors, - load_rsa_nist_vectors, load_vectors_from_file, + check_backend_support, check_for_iface, dss_sig_value, + load_cryptrec_vectors, load_fips_dsa_key_pair_vectors, + load_fips_dsa_sig_vectors, load_fips_ecdsa_key_pair_vectors, + load_fips_ecdsa_signing_vectors, load_hash_vectors, load_nist_vectors, + load_pkcs1_vectors, load_rsa_nist_vectors, load_vectors_from_file, raises_unsupported_algorithm, select_backends ) @@ -125,6 +125,32 @@ def test_check_backend_support_no_backend(): check_backend_support(item) +def test_dss_sig_value(): + sig = dss_sig_value(1, 1) + assert sig == b"0\x06\x02\x01\x01\x02\x01\x01" + + sig2 = dss_sig_value(1037234182290683143945502320610861668562885151617, + 559776156650501990899426031439030258256861634312) + assert sig2 == ( + b'0-\x02\x15\x00\xb5\xaf0xg\xfb\x8bT9\x00\x13\xccg\x02\r\xdf\x1f,\x0b' + b'\x81\x02\x14b\r;"\xabP1D\x0c>5\xea\xb6\xf4\x81)\x8f\x9e\x9f\x08' + ) + + sig3 = dss_sig_value(0, 0) + assert sig3 == b"0\x06\x02\x01\x00\x02\x01\x00" + + +def test_dss_sig_value_negative(): + with pytest.raises(ValueError): + dss_sig_value(-1, 1) + + with pytest.raises(ValueError): + dss_sig_value(1, -1) + + with pytest.raises(ValueError): + dss_sig_value(-1, -1) + + def test_load_nist_vectors(): vector_data = textwrap.dedent(""" # CAVS 11.1 -- cgit v1.2.3 From d3e3df9308498153e795f6421b83b97c493c1aba Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 30 Apr 2014 11:13:17 -0500 Subject: use pyasn1 for creating the dss-sig-value structure --- tests/test_utils.py | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'tests/test_utils.py') diff --git a/tests/test_utils.py b/tests/test_utils.py index 7b3ffbc3..ae9f6928 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -140,17 +140,6 @@ def test_dss_sig_value(): assert sig3 == b"0\x06\x02\x01\x00\x02\x01\x00" -def test_dss_sig_value_negative(): - with pytest.raises(ValueError): - dss_sig_value(-1, 1) - - with pytest.raises(ValueError): - dss_sig_value(1, -1) - - with pytest.raises(ValueError): - dss_sig_value(-1, -1) - - def test_load_nist_vectors(): vector_data = textwrap.dedent(""" # CAVS 11.1 -- cgit v1.2.3 From 14951f4252814c0cfcde5db05b4af12e93f570a9 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 30 Apr 2014 12:14:48 -0500 Subject: rename dss_sig_value -> der_encode_dsa_signature --- tests/test_utils.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tests/test_utils.py') diff --git a/tests/test_utils.py b/tests/test_utils.py index ae9f6928..e454cc20 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -27,7 +27,7 @@ from cryptography.exceptions import UnsupportedAlgorithm, _Reasons import cryptography_vectors from .utils import ( - check_backend_support, check_for_iface, dss_sig_value, + check_backend_support, check_for_iface, der_encode_dsa_signature, load_cryptrec_vectors, load_fips_dsa_key_pair_vectors, load_fips_dsa_sig_vectors, load_fips_ecdsa_key_pair_vectors, load_fips_ecdsa_signing_vectors, load_hash_vectors, load_nist_vectors, @@ -125,18 +125,20 @@ def test_check_backend_support_no_backend(): check_backend_support(item) -def test_dss_sig_value(): - sig = dss_sig_value(1, 1) +def test_der_encode_dsa_signature_values(): + sig = der_encode_dsa_signature(1, 1) assert sig == b"0\x06\x02\x01\x01\x02\x01\x01" - sig2 = dss_sig_value(1037234182290683143945502320610861668562885151617, - 559776156650501990899426031439030258256861634312) + sig2 = der_encode_dsa_signature( + 1037234182290683143945502320610861668562885151617, + 559776156650501990899426031439030258256861634312 + ) assert sig2 == ( b'0-\x02\x15\x00\xb5\xaf0xg\xfb\x8bT9\x00\x13\xccg\x02\r\xdf\x1f,\x0b' b'\x81\x02\x14b\r;"\xabP1D\x0c>5\xea\xb6\xf4\x81)\x8f\x9e\x9f\x08' ) - sig3 = dss_sig_value(0, 0) + sig3 = der_encode_dsa_signature(0, 0) assert sig3 == b"0\x06\x02\x01\x00\x02\x01\x00" -- cgit v1.2.3 From be8ce55717d4c2951a76c0989a692a20aa338ea1 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 30 Apr 2014 14:12:26 -0500 Subject: negative test --- tests/test_utils.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests/test_utils.py') diff --git a/tests/test_utils.py b/tests/test_utils.py index e454cc20..4673b49e 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -141,6 +141,9 @@ def test_der_encode_dsa_signature_values(): sig3 = der_encode_dsa_signature(0, 0) assert sig3 == b"0\x06\x02\x01\x00\x02\x01\x00" + sig4 = der_encode_dsa_signature(-1, 0) + assert sig4 == b"0\x06\x02\x01\xFF\x02\x01\x00" + def test_load_nist_vectors(): vector_data = textwrap.dedent(""" -- cgit v1.2.3