aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-04-24 15:51:26 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-04-24 16:41:45 -0500
commit4ce810e22ccbf9ed1eadb4695e4cbe4cb59230fa (patch)
treeab4344cb40fa221247a5756d9edf6dc734cb4236
parent6ff1348dc76c8f900cabe0d281ef898cce6693f7 (diff)
downloadcryptography-4ce810e22ccbf9ed1eadb4695e4cbe4cb59230fa.tar.gz
cryptography-4ce810e22ccbf9ed1eadb4695e4cbe4cb59230fa.tar.bz2
cryptography-4ce810e22ccbf9ed1eadb4695e4cbe4cb59230fa.zip
improve style in test, update docs for rsa encryption review
-rw-r--r--docs/hazmat/primitives/asymmetric/rsa.rst3
-rw-r--r--tests/hazmat/primitives/test_rsa.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/asymmetric/rsa.rst b/docs/hazmat/primitives/asymmetric/rsa.rst
index ed0e1008..68ad089d 100644
--- a/docs/hazmat/primitives/asymmetric/rsa.rst
+++ b/docs/hazmat/primitives/asymmetric/rsa.rst
@@ -271,7 +271,8 @@ RSA
.. versionadded:: 0.4
- Encrypt data using the public key.
+ Encrypt data using the public key. The resulting ciphertext can only
+ be decrypted with the private key.
:param bytes plaintext: The plaintext to encrypt.
diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py
index 2661c1e9..adc46de4 100644
--- a/tests/hazmat/primitives/test_rsa.py
+++ b/tests/hazmat/primitives/test_rsa.py
@@ -1420,7 +1420,7 @@ class TestRSAEncryption(object):
assert recovered_pt == pt
@pytest.mark.parametrize(
- "key_size,pad",
+ ["key_size", "pad"],
itertools.product(
(1024, 1025, 1029, 1031, 1536, 2048),
(