rename the function

2 files changed, 18 insertions, 18 deletions

diff --git a/cryptography/hazmat/primitives/asymmetric/rsa.py b/cryptography/hazmat/primitives/asymmetric/rsa.py
index 94f07902..b256ddcc 100644
--- a/cryptography/hazmat/primitives/asymmetric/rsa.py
+++ b/cryptography/hazmat/primitives/asymmetric/rsa.py
@@ -21,7 +21,7 @@ from cryptography.hazmat.backends.interfaces import RSABackend
 from cryptography.hazmat.primitives import interfaces
 
 
-def generate_rsa_private_key(public_exponent, key_size, backend):
+def generate_private_key(public_exponent, key_size, backend):
     if not isinstance(backend, RSABackend):
         raise UnsupportedAlgorithm(
             "Backend object does not implement RSABackend.",
diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py
index 31cb8163..4f917d66 100644
--- a/tests/hazmat/primitives/test_rsa.py
+++ b/tests/hazmat/primitives/test_rsa.py
@@ -94,7 +94,7 @@ class TestRSA(object):
         )
     )
     def test_generate_rsa_keys(self, backend, public_exponent, key_size):
-        skey = rsa.generate_rsa_private_key(public_exponent, key_size, backend)
+        skey = rsa.generate_private_key(public_exponent, key_size, backend)
         _check_rsa_private_key(skey)
         assert skey.key_size == key_size
         assert skey.public_exponent == public_exponent
@@ -107,25 +107,25 @@ class TestRSA(object):
 
     def test_generate_bad_public_exponent(self, backend):
         with pytest.raises(ValueError):
-            rsa.generate_rsa_private_key(public_exponent=1,
-                                         key_size=2048,
-                                         backend=backend)
+            rsa.generate_private_key(public_exponent=1,
+                                     key_size=2048,
+                                     backend=backend)
 
         with pytest.raises(ValueError):
-            rsa.generate_rsa_private_key(public_exponent=4,
-                                         key_size=2048,
-                                         backend=backend)
+            rsa.generate_private_key(public_exponent=4,
+                                     key_size=2048,
+                                     backend=backend)
 
     def test_cant_generate_insecure_tiny_key(self, backend):
         with pytest.raises(ValueError):
-            rsa.generate_rsa_private_key(public_exponent=65537,
-                                         key_size=511,
-                                         backend=backend)
+            rsa.generate_private_key(public_exponent=65537,
+                                     key_size=511,
+                                     backend=backend)
 
         with pytest.raises(ValueError):
-            rsa.generate_rsa_private_key(public_exponent=65537,
-                                         key_size=256,
-                                         backend=backend)
+            rsa.generate_private_key(public_exponent=65537,
+                                     key_size=256,
+                                     backend=backend)
 
     @pytest.mark.parametrize(
         "pkcs1_example",
@@ -383,7 +383,7 @@ def test_rsa_generate_invalid_backend():
     pretend_backend = object()
 
     with raises_unsupported_algorithm(_Reasons.BACKEND_MISSING_INTERFACE):
-        rsa.generate_rsa_private_key(65537, 2048, pretend_backend)
+        rsa.generate_private_key(65537, 2048, pretend_backend)
 
     with raises_unsupported_algorithm(_Reasons.BACKEND_MISSING_INTERFACE):
         rsa.RSAPrivateKey.generate(65537, 2048, pretend_backend)
@@ -972,7 +972,7 @@ class TestRSAVerification(object):
 
     def test_rsa_verifier_invalid_backend(self, backend):
         pretend_backend = object()
-        private_key = rsa.generate_rsa_private_key(65537, 2048, backend)
+        private_key = rsa.generate_private_key(65537, 2048, backend)
         public_key = private_key.public_key()
 
         with raises_unsupported_algorithm(_Reasons.BACKEND_MISSING_INTERFACE):
@@ -1463,7 +1463,7 @@ class TestRSADecryption(object):
 
     def test_rsa_decrypt_invalid_backend(self, backend):
         pretend_backend = object()
-        private_key = rsa.generate_rsa_private_key(65537, 2048, backend)
+        private_key = rsa.RSAPrivateKey.generate(65537, 2048, backend)
 
         with raises_unsupported_algorithm(_Reasons.BACKEND_MISSING_INTERFACE):
             private_key.decrypt(
@@ -1642,7 +1642,7 @@ class TestRSAEncryption(object):
 
     def test_rsa_encrypt_invalid_backend(self, backend):
         pretend_backend = object()
-        private_key = rsa.generate_rsa_private_key(65537, 512, backend)
+        private_key = rsa.RSAPrivateKey.generate(65537, 512, backend)
         public_key = private_key.public_key()
 
         with raises_unsupported_algorithm(_Reasons.BACKEND_MISSING_INTERFACE):