aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-03-10 10:01:18 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-03-10 10:01:18 -0400
commitfcadda6a89095fc92e6fe2e248e93b642ce8580b (patch)
tree84f534b4b8000c859b9213da61c431a739b71f5c /tests/hazmat
parentd0109a59993ba568bb81a67a062dcfb460692447 (diff)
downloadcryptography-fcadda6a89095fc92e6fe2e248e93b642ce8580b.tar.gz
cryptography-fcadda6a89095fc92e6fe2e248e93b642ce8580b.tar.bz2
cryptography-fcadda6a89095fc92e6fe2e248e93b642ce8580b.zip
Fixed the deprecation warnings being triggered by the tests
Diffstat (limited to 'tests/hazmat')
-rw-r--r--tests/hazmat/primitives/test_dsa.py4
-rw-r--r--tests/hazmat/primitives/test_ec.py2
-rw-r--r--tests/hazmat/primitives/test_rsa.py2
-rw-r--r--tests/hazmat/primitives/test_serialization.py12
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/hazmat/primitives/test_dsa.py b/tests/hazmat/primitives/test_dsa.py
index 112818f4..bbafbc6c 100644
--- a/tests/hazmat/primitives/test_dsa.py
+++ b/tests/hazmat/primitives/test_dsa.py
@@ -75,7 +75,7 @@ class TestDSA(object):
g=vector['g']
).parameters(backend)
skey = parameters.generate_private_key()
- if isinstance(skey, dsa.DSAPrivateKeyWithNumbers):
+ if isinstance(skey, dsa.DSAPrivateKeyWithSerialization):
numbers = skey.private_numbers()
skey_parameters = numbers.public_numbers.parameter_numbers
pkey = skey.public_key()
@@ -98,7 +98,7 @@ class TestDSA(object):
def test_generate_dsa_private_key_and_parameters(self, backend):
skey = dsa.generate_private_key(1024, backend)
assert skey
- if isinstance(skey, dsa.DSAPrivateKeyWithNumbers):
+ if isinstance(skey, dsa.DSAPrivateKeyWithSerialization):
numbers = skey.private_numbers()
skey_parameters = numbers.public_numbers.parameter_numbers
assert numbers.public_numbers.y == pow(
diff --git a/tests/hazmat/primitives/test_ec.py b/tests/hazmat/primitives/test_ec.py
index 40b1741c..23f9aff9 100644
--- a/tests/hazmat/primitives/test_ec.py
+++ b/tests/hazmat/primitives/test_ec.py
@@ -173,7 +173,7 @@ class TestECWithNumbers(object):
).private_key(backend)
assert key
- if isinstance(key, ec.EllipticCurvePrivateKeyWithNumbers):
+ if isinstance(key, ec.EllipticCurvePrivateKeyWithSerialization):
priv_num = key.private_numbers()
assert priv_num.private_value == vector['d']
assert priv_num.public_numbers.x == vector['x']
diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py
index e6d0ac28..d79d9320 100644
--- a/tests/hazmat/primitives/test_rsa.py
+++ b/tests/hazmat/primitives/test_rsa.py
@@ -113,7 +113,7 @@ class TestRSA(object):
skey = rsa.generate_private_key(public_exponent, key_size, backend)
assert skey.key_size == key_size
- if isinstance(skey, rsa.RSAPrivateKeyWithNumbers):
+ if isinstance(skey, rsa.RSAPrivateKeyWithSerialization):
_check_rsa_private_numbers(skey.private_numbers())
pkey = skey.public_key()
assert isinstance(pkey.public_numbers(), rsa.RSAPublicNumbers)
diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py
index 07a8f02e..22c2145c 100644
--- a/tests/hazmat/primitives/test_serialization.py
+++ b/tests/hazmat/primitives/test_serialization.py
@@ -53,7 +53,7 @@ class TestDERSerialization(object):
)
assert key
assert isinstance(key, rsa.RSAPrivateKey)
- if isinstance(key, rsa.RSAPrivateKeyWithNumbers):
+ if isinstance(key, rsa.RSAPrivateKeyWithSerialization):
_check_rsa_private_numbers(key.private_numbers())
@pytest.mark.requires_backend_interface(interface=DSABackend)
@@ -76,7 +76,7 @@ class TestDERSerialization(object):
)
assert key
assert isinstance(key, dsa.DSAPrivateKey)
- if isinstance(key, dsa.DSAPrivateKeyWithNumbers):
+ if isinstance(key, dsa.DSAPrivateKeyWithSerialization):
_check_dsa_private_numbers(key.private_numbers())
@pytest.mark.parametrize(
@@ -247,7 +247,7 @@ class TestDERSerialization(object):
)
assert key
assert isinstance(key, rsa.RSAPublicKey)
- if isinstance(key, rsa.RSAPublicKeyWithNumbers):
+ if isinstance(key, rsa.RSAPublicKeyWithSerialization):
numbers = key.public_numbers()
assert numbers.e == 65537
@@ -330,7 +330,7 @@ class TestPEMSerialization(object):
assert key
assert isinstance(key, rsa.RSAPrivateKey)
- if isinstance(key, rsa.RSAPrivateKeyWithNumbers):
+ if isinstance(key, rsa.RSAPrivateKeyWithSerialization):
_check_rsa_private_numbers(key.private_numbers())
@pytest.mark.parametrize(
@@ -352,7 +352,7 @@ class TestPEMSerialization(object):
)
assert key
assert isinstance(key, dsa.DSAPrivateKey)
- if isinstance(key, dsa.DSAPrivateKeyWithNumbers):
+ if isinstance(key, dsa.DSAPrivateKeyWithSerialization):
_check_dsa_private_numbers(key.private_numbers())
@pytest.mark.parametrize(
@@ -397,7 +397,7 @@ class TestPEMSerialization(object):
)
assert key
assert isinstance(key, rsa.RSAPublicKey)
- if isinstance(key, rsa.RSAPublicKeyWithNumbers):
+ if isinstance(key, rsa.RSAPublicKeyWithSerialization):
numbers = key.public_numbers()
assert numbers.e == 65537