aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-02-23 21:54:36 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-02-25 07:50:25 -0600
commit4d236049529bc1ab1b301756a6c9be7a30ce8f8a (patch)
tree46312fbea8b19ecda7c373ee9f33085af0afae30 /docs/hazmat
parent199dc276cd1b45a799b511090b37237df49d68a3 (diff)
downloadcryptography-4d236049529bc1ab1b301756a6c9be7a30ce8f8a.tar.gz
cryptography-4d236049529bc1ab1b301756a6c9be7a30ce8f8a.tar.bz2
cryptography-4d236049529bc1ab1b301756a6c9be7a30ce8f8a.zip
fix docs
Diffstat (limited to 'docs/hazmat')
-rw-r--r--docs/hazmat/primitives/asymmetric/rsa.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/hazmat/primitives/asymmetric/rsa.rst b/docs/hazmat/primitives/asymmetric/rsa.rst
index ab2fe4e5..ac58b9d2 100644
--- a/docs/hazmat/primitives/asymmetric/rsa.rst
+++ b/docs/hazmat/primitives/asymmetric/rsa.rst
@@ -95,7 +95,7 @@ to serialize the key.
>>> pem = private_key.dump(
... encoding=serialization.Encoding.PEM,
... fmt=serialization.Format.PKCS8,
- ... encryption_type=serialization.BestAvailableEncryption(b'mypassword')
+ ... encryption_algorithm=serialization.BestAvailableEncryption(b'mypassword')
... )
>>> pem.splitlines()[0]
'-----BEGIN ENCRYPTED PRIVATE KEY-----'
@@ -107,8 +107,8 @@ It is also possible to serialize without encryption using
>>> pem = private_key.dump(
... encoding=serialization.Encoding.PEM,
- ... fmt=serialization.Format.PKCS8,
- ... encryption_type=serialization.NoEncryption()
+ ... fmt=serialization.Format.TraditionalOpenSSL,
+ ... encryption_algorithm=serialization.NoEncryption()
... )
>>> pem.splitlines()[0]
'-----BEGIN RSA PRIVATE KEY-----'
@@ -534,7 +534,7 @@ Key interfaces
:class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPrivateNumbers`
instance.
- .. method:: dump(encoding, fmt, encryption_type)
+ .. method:: dump(encoding, fmt, encryption_algorithm)
Dump the key to PEM encoded bytes using the serializer provided.
@@ -544,7 +544,7 @@ Key interfaces
:param fmt: A value from the
:class:`~cryptography.hazmat.primitives.serialization.Format` enum.
- :param encryption_type: An instance of an object conforming to the
+ :param encryption_algorithm: An instance of an object conforming to the
:class:`~cryptography.hazmat.primitives.serialization.KeySerializationEncryption`
interface.