diff options
author | Laurens Van Houtven <_@lvh.io> | 2015-04-20 11:25:57 -0700 |
---|---|---|
committer | Laurens Van Houtven <_@lvh.io> | 2015-04-20 11:25:57 -0700 |
commit | 0f82087eca7cb9e38c855f2108dfd7d10492705c (patch) | |
tree | 8981c5d4e8c0adb85c58f1adb46879979e201fe4 /doc/api | |
parent | c6a30d9d4ab7d16e1a83fa34cbeaa14df91ed2af (diff) | |
download | pyopenssl-0f82087eca7cb9e38c855f2108dfd7d10492705c.tar.gz |
X509 appears later
Diffstat (limited to 'doc/api')
-rw-r--r-- | doc/api/crypto.rst | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/doc/api/crypto.rst b/doc/api/crypto.rst index 185db9d..fc5619c 100644 --- a/doc/api/crypto.rst +++ b/doc/api/crypto.rst @@ -7,11 +7,6 @@ :synopsis: Generic cryptographic module -.. py:class:: X509() - - A class representing X.509 certificates. - - .. py:class:: X509Name(x509name) A class representing X.509 Distinguished Names. @@ -183,7 +178,9 @@ Certificate revocation lists .. py:function:: load_pkcs7_data(type, buffer) - Load pkcs7 data from the string *buffer* encoded with the type *type*. + Load pkcs7 data from the string *buffer* encoded with the type + *type*. The type *type* must either :py:const:`FILETYPE_PEM` or + :py:const:`FILETYPE_ASN1`). .. py:function:: load_pkcs12(buffer[, passphrase]) |