Merge pull request #1080 from reaperhulk/generate-rsa-parameters

add generate_rsa_parameters_supported to RSABackend

3 files changed, 17 insertions, 1 deletions

diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py
index 63d7dd23..3fa364e2 100644
--- a/tests/hazmat/backends/test_multibackend.py
+++ b/tests/hazmat/backends/test_multibackend.py
@@ -104,6 +104,9 @@ class DummyRSABackend(object):
     def rsa_padding_supported(self, padding):
         pass
 
+    def generate_rsa_parameters_supported(self, public_exponent, key_size):
+        pass
+
     def decrypt_rsa(self, private_key, ciphertext, padding):
         pass
 
@@ -227,6 +230,8 @@ class TestMultiBackend(object):
 
         backend.rsa_padding_supported(padding.PKCS1v15())
 
+        backend.generate_rsa_parameters_supported(65537, 1024)
+
         backend.encrypt_rsa("public_key", "encryptme", padding.PKCS1v15())
 
         backend.decrypt_rsa("private_key", "encrypted", padding.PKCS1v15())
@@ -262,6 +267,11 @@ class TestMultiBackend(object):
         with raises_unsupported_algorithm(
             _Reasons.UNSUPPORTED_PUBLIC_KEY_ALGORITHM
         ):
+            backend.generate_rsa_parameters_supported(65537, 1024)
+
+        with raises_unsupported_algorithm(
+            _Reasons.UNSUPPORTED_PUBLIC_KEY_ALGORITHM
+        ):
             backend.encrypt_rsa("public_key", "encryptme", padding.PKCS1v15())
 
         with raises_unsupported_algorithm(
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py
index f9896233..0ccf7286 100644
--- a/tests/hazmat/backends/test_openssl.py
+++ b/tests/hazmat/backends/test_openssl.py
@@ -271,6 +271,12 @@ class TestOpenSSLRandomEngine(object):
 
 
 class TestOpenSSLRSA(object):
+    def test_generate_rsa_parameters_supported(self):
+        assert backend.generate_rsa_parameters_supported(1, 1024) is False
+        assert backend.generate_rsa_parameters_supported(4, 1024) is False
+        assert backend.generate_rsa_parameters_supported(3, 1024) is True
+        assert backend.generate_rsa_parameters_supported(3, 511) is False
+
     @pytest.mark.skipif(
         backend._lib.OPENSSL_VERSION_NUMBER >= 0x1000100f,
         reason="Requires an older OpenSSL. Must be < 1.0.1"
diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py
index fcb72e00..ea72f916 100644
--- a/tests/hazmat/primitives/test_rsa.py
+++ b/tests/hazmat/primitives/test_rsa.py
@@ -99,7 +99,7 @@ class TestRSA(object):
         assert skey.key_size == key_size
         assert skey.public_exponent == public_exponent
 
-    def test_generate_bad_rsa_key(self, backend):
+    def test_generate_bad_public_exponent(self, backend):
         with pytest.raises(ValueError):
             rsa.RSAPrivateKey.generate(public_exponent=1,
                                        key_size=2048,