aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-03-01 21:56:32 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-03-02 08:17:16 -0600
commitf1c7b740324be18e0f67f095a81d6d8802498a2c (patch)
tree72f5524a1cdd2134d26c835f68a898fdedea05db /docs/hazmat
parent61ecd279ac3247a925d614c55c1e73d2dd87ea94 (diff)
downloadcryptography-f1c7b740324be18e0f67f095a81d6d8802498a2c.tar.gz
cryptography-f1c7b740324be18e0f67f095a81d6d8802498a2c.tar.bz2
cryptography-f1c7b740324be18e0f67f095a81d6d8802498a2c.zip
format to privateformat
Diffstat (limited to 'docs/hazmat')
-rw-r--r--docs/hazmat/primitives/asymmetric/ec.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/hazmat/primitives/asymmetric/ec.rst b/docs/hazmat/primitives/asymmetric/ec.rst
index cf616a0d..256c1832 100644
--- a/docs/hazmat/primitives/asymmetric/ec.rst
+++ b/docs/hazmat/primitives/asymmetric/ec.rst
@@ -344,10 +344,10 @@ Key Interfaces
:attr:`~cryptography.hazmat.primitives.serialization.Encoding.PEM` or
:attr:`~cryptography.hazmat.primitives.serialization.Encoding.DER`),
format (
- :attr:`~cryptography.hazmat.primitives.serialization.Format.TraditionalOpenSSL`
+ :attr:`~cryptography.hazmat.primitives.serialization.PrivateFormat.TraditionalOpenSSL`
or
- :attr:`~cryptography.hazmat.primitives.serialization.Format.PKCS8`) and
- encryption algorithm (such as
+ :attr:`~cryptography.hazmat.primitives.serialization.PrivateFormat.PKCS8`)
+ and encryption algorithm (such as
:class:`~cryptography.hazmat.primitives.serialization.BestAvailableEncryption`
or :class:`~cryptography.hazmat.primitives.serialization.NoEncryption`)
are chosen to define the exact serialization.
@@ -356,7 +356,7 @@ Key Interfaces
:class:`~cryptography.hazmat.primitives.serialization.Encoding` enum.
:param format: A value from the
- :class:`~cryptography.hazmat.primitives.serialization.Format` enum.
+ :class:`~cryptography.hazmat.primitives.serialization.PrivateFormat` enum.
:param encryption_algorithm: An instance of an object conforming to the
:class:`~cryptography.hazmat.primitives.serialization.KeySerializationEncryption`