diff options
Diffstat (limited to 'tests/hazmat')
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 6 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_ec.py | 28 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_serialization.py | 4 |
3 files changed, 13 insertions, 25 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index d4c5e2e7..110bbdba 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -493,7 +493,7 @@ class TestOpenSSLSerialisationWithOpenSSL(object): ) -class TestOpenSSLNoEllipticCurve(object): +class TestOpenSSLEllipticCurve(object): def test_elliptic_curve_supported(self, monkeypatch): monkeypatch.setattr(backend._lib, "Cryptography_HAS_EC", 0) @@ -506,6 +506,10 @@ class TestOpenSSLNoEllipticCurve(object): None, None ) is False + def test_sn_to_elliptic_curve_not_supported(self): + with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_ELLIPTIC_CURVE): + backend._sn_to_elliptic_curve(b"fake") + class TestDeprecatedRSABackendMethods(object): def test_create_rsa_signature_ctx(self): diff --git a/tests/hazmat/primitives/test_ec.py b/tests/hazmat/primitives/test_ec.py index 2690e794..65461f70 100644 --- a/tests/hazmat/primitives/test_ec.py +++ b/tests/hazmat/primitives/test_ec.py @@ -29,26 +29,6 @@ from ...utils import ( raises_unsupported_algorithm ) -_CURVE_TYPES = { - "secp192r1": ec.SECP192R1, - "secp224r1": ec.SECP224R1, - "secp256r1": ec.SECP256R1, - "secp384r1": ec.SECP384R1, - "secp521r1": ec.SECP521R1, - - "sect163k1": ec.SECT163K1, - "sect233k1": ec.SECT233K1, - "sect283k1": ec.SECT283K1, - "sect409k1": ec.SECT409K1, - "sect571k1": ec.SECT571K1, - - "sect163r2": ec.SECT163R2, - "sect233r1": ec.SECT233R1, - "sect283r1": ec.SECT283R1, - "sect409r1": ec.SECT409R1, - "sect571r1": ec.SECT571R1, -} - _HASH_TYPES = { "SHA-1": hashes.SHA1, "SHA-224": hashes.SHA224, @@ -162,7 +142,7 @@ class TestECDSAVectors(object): )) ) def test_signing_with_example_keys(self, backend, vector, hash_type): - curve_type = _CURVE_TYPES[vector['curve']] + curve_type = ec._CURVE_TYPES[vector['curve']] _skip_ecdsa_vector(backend, curve_type, hash_type) @@ -188,7 +168,7 @@ class TestECDSAVectors(object): verifier.verify() @pytest.mark.parametrize( - "curve", _CURVE_TYPES.values() + "curve", ec._CURVE_TYPES.values() ) def test_generate_vector_curves(self, backend, curve): _skip_curve_unsupported(backend, curve()) @@ -244,7 +224,7 @@ class TestECDSAVectors(object): ) def test_signatures(self, backend, vector): hash_type = _HASH_TYPES[vector['digest_algorithm']] - curve_type = _CURVE_TYPES[vector['curve']] + curve_type = ec._CURVE_TYPES[vector['curve']] _skip_ecdsa_vector(backend, curve_type, hash_type) @@ -276,7 +256,7 @@ class TestECDSAVectors(object): ) def test_signature_failures(self, backend, vector): hash_type = _HASH_TYPES[vector['digest_algorithm']] - curve_type = _CURVE_TYPES[vector['curve']] + curve_type = ec._CURVE_TYPES[vector['curve']] _skip_ecdsa_vector(backend, curve_type, hash_type) diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index 8405f4b2..5ee68b23 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -135,6 +135,8 @@ class TestPEMSerialization(object): ) assert key assert isinstance(key, interfaces.EllipticCurvePublicKey) + assert key.curve.name == "secp256r1" + assert key.curve.key_size == 256 @pytest.mark.traditional_openssl_serialization @@ -412,6 +414,8 @@ class TestPKCS8Serialization(object): ) assert key assert isinstance(key, interfaces.EllipticCurvePrivateKey) + assert key.curve.name == "secp256r1" + assert key.curve.key_size == 256 def test_unused_password(self, backend): key_file = os.path.join( |