summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-07-19 21:09:04 +0200
committerAlex Gaynor <alex.gaynor@gmail.com>2017-07-19 15:09:04 -0400
commitdc996b108faaa0a91eceaffce2972f21c61ccc9c (patch)
tree0aeaa177b5e54be225f1fbf2dc049433d675f66b /doc
parenta92a1a708f3973d0640a6f7c9e43adf1e6925f82 (diff)
downloadpyopenssl-dc996b108faaa0a91eceaffce2972f21c61ccc9c.tar.gz
add note about cryptography to crypto module (#666)
fixes #663
Diffstat (limited to 'doc')
-rw-r--r--doc/api/crypto.rst10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/api/crypto.rst b/doc/api/crypto.rst
index e7190ab..04d7ccf 100644
--- a/doc/api/crypto.rst
+++ b/doc/api/crypto.rst
@@ -6,6 +6,15 @@
.. py:module:: OpenSSL.crypto
:synopsis: Generic cryptographic module
+.. note::
+
+ `pyca/cryptography`_ is likely a better choice than using this module. It
+ contains a complete set of cryptographic primitives as well as a
+ significantly better and more powerful X509 API. If necessary you can
+ convert to and from cryptography objects using the ``to_cryptography``
+ and ``from_cryptography`` methods on ``X509``, ``X509Req``, ``CRL``,
+ and ``PKey``.
+
Elliptic curves
---------------
@@ -321,3 +330,4 @@ More information and a list of these digest names can be found in the ``EVP_Dige
This page can be found online for the latest version of OpenSSL:
https://www.openssl.org/docs/manmaster/man3/EVP_DigestInit.html
+.. _`pyca/cryptography`: https://cryptography.io