From 6bca12ffdac94bc3ad0865c27ead1f5e9bba5325 Mon Sep 17 00:00:00 2001 From: David Reid Date: Thu, 8 May 2014 10:09:37 -0700 Subject: Add load_rsa_numbers support to MultiBackend. --- tests/hazmat/backends/test_multibackend.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tests/hazmat/backends/test_multibackend.py') diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py index 3fa364e2..d4c89be3 100644 --- a/tests/hazmat/backends/test_multibackend.py +++ b/tests/hazmat/backends/test_multibackend.py @@ -23,7 +23,7 @@ from cryptography.hazmat.backends.interfaces import ( ) from cryptography.hazmat.backends.multibackend import MultiBackend from cryptography.hazmat.primitives import cmac, hashes, hmac -from cryptography.hazmat.primitives.asymmetric import padding +from cryptography.hazmat.primitives.asymmetric import padding, rsa from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from ...utils import raises_unsupported_algorithm @@ -111,6 +111,8 @@ class DummyRSABackend(object): pass def encrypt_rsa(self, public_key, plaintext, padding): + + def load_rsa_numbers(self, numbers): pass @@ -236,6 +238,8 @@ class TestMultiBackend(object): backend.decrypt_rsa("private_key", "encrypted", padding.PKCS1v15()) + backend.load_rsa_numbers(rsa.RSAPublicNumbers(e=3, n=1)) + backend = MultiBackend([]) with raises_unsupported_algorithm( _Reasons.UNSUPPORTED_PUBLIC_KEY_ALGORITHM @@ -279,6 +283,11 @@ class TestMultiBackend(object): ): backend.decrypt_rsa("private_key", "encrypted", padding.PKCS1v15()) + with raises_unsupported_algorithm( + _Reasons.UNSUPPORTED_PUBLIC_KEY_ALGORITHM + ): + backend.load_rsa_numbers(rsa.RSAPublicNumbers(e=3, n=1)) + def test_dsa(self): backend = MultiBackend([ DummyDSABackend() -- cgit v1.2.3 From 30cbba7a13e4352fae4949c0924768866de3d049 Mon Sep 17 00:00:00 2001 From: David Reid Date: Wed, 28 May 2014 14:44:58 -0700 Subject: Semantic conflict resolution anyone? --- tests/hazmat/backends/test_multibackend.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/hazmat/backends/test_multibackend.py') diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py index d4c89be3..b399837d 100644 --- a/tests/hazmat/backends/test_multibackend.py +++ b/tests/hazmat/backends/test_multibackend.py @@ -111,7 +111,8 @@ class DummyRSABackend(object): pass def encrypt_rsa(self, public_key, plaintext, padding): - + pass + def load_rsa_numbers(self, numbers): pass -- cgit v1.2.3 From 85936b2fbf496b8a93b71557573583985276bc29 Mon Sep 17 00:00:00 2001 From: David Reid Date: Wed, 28 May 2014 14:58:06 -0700 Subject: Remove trailing whitespace --- tests/hazmat/backends/test_multibackend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/hazmat/backends/test_multibackend.py') diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py index b399837d..71755f91 100644 --- a/tests/hazmat/backends/test_multibackend.py +++ b/tests/hazmat/backends/test_multibackend.py @@ -112,7 +112,7 @@ class DummyRSABackend(object): def encrypt_rsa(self, public_key, plaintext, padding): pass - + def load_rsa_numbers(self, numbers): pass -- cgit v1.2.3 From a674afef93a23d5cf85e6c86e8c007cc338c37d5 Mon Sep 17 00:00:00 2001 From: David Reid Date: Fri, 30 May 2014 14:15:29 -0700 Subject: Split load_rsa_numbers into load_rsa_private_numbers and load_rsa_public_numbers. --- tests/hazmat/backends/test_multibackend.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'tests/hazmat/backends/test_multibackend.py') diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py index 71755f91..5a624204 100644 --- a/tests/hazmat/backends/test_multibackend.py +++ b/tests/hazmat/backends/test_multibackend.py @@ -113,7 +113,10 @@ class DummyRSABackend(object): def encrypt_rsa(self, public_key, plaintext, padding): pass - def load_rsa_numbers(self, numbers): + def load_rsa_private_numbers(self, numbers): + pass + + def load_rsa_public_numbers(self, numbers): pass @@ -239,7 +242,9 @@ class TestMultiBackend(object): backend.decrypt_rsa("private_key", "encrypted", padding.PKCS1v15()) - backend.load_rsa_numbers(rsa.RSAPublicNumbers(e=3, n=1)) + backend.load_rsa_private_numbers("private_numbers") + + backend.load_rsa_public_numbers("public_numbers") backend = MultiBackend([]) with raises_unsupported_algorithm( @@ -287,7 +292,12 @@ class TestMultiBackend(object): with raises_unsupported_algorithm( _Reasons.UNSUPPORTED_PUBLIC_KEY_ALGORITHM ): - backend.load_rsa_numbers(rsa.RSAPublicNumbers(e=3, n=1)) + backend.load_rsa_private_numbers("private_numbers") + + with raises_unsupported_algorithm( + _Reasons.UNSUPPORTED_PUBLIC_KEY_ALGORITHM + ): + backend.load_rsa_public_numbers("public_numbers") def test_dsa(self): backend = MultiBackend([ -- cgit v1.2.3 From 414e2f7410f7aeded99be1740f252a49956cd496 Mon Sep 17 00:00:00 2001 From: David Reid Date: Fri, 30 May 2014 14:33:03 -0700 Subject: pep8 --- tests/hazmat/backends/test_multibackend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/hazmat/backends/test_multibackend.py') diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py index 5a624204..93d58483 100644 --- a/tests/hazmat/backends/test_multibackend.py +++ b/tests/hazmat/backends/test_multibackend.py @@ -23,7 +23,7 @@ from cryptography.hazmat.backends.interfaces import ( ) from cryptography.hazmat.backends.multibackend import MultiBackend from cryptography.hazmat.primitives import cmac, hashes, hmac -from cryptography.hazmat.primitives.asymmetric import padding, rsa +from cryptography.hazmat.primitives.asymmetric import padding from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from ...utils import raises_unsupported_algorithm -- cgit v1.2.3