aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/backends
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-02-03 16:13:09 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-02-03 16:13:09 -0800
commit53f6dbca6e5a5a727c58e6c1fc320e09503d1cba (patch)
treeea51a47b4d0b69103bbca62d759cc9005ce3d109 /docs/hazmat/backends
parent2b1752ed68a08255ddacf1800c6cb6b406ce5e4b (diff)
parent59ca2fc4a93ed398e5c2674b7c98a81ed95e0930 (diff)
downloadcryptography-53f6dbca6e5a5a727c58e6c1fc320e09503d1cba.tar.gz
cryptography-53f6dbca6e5a5a727c58e6c1fc320e09503d1cba.tar.bz2
cryptography-53f6dbca6e5a5a727c58e6c1fc320e09503d1cba.zip
Merge branch 'master' into prioritized-multi-backend
Diffstat (limited to 'docs/hazmat/backends')
-rw-r--r--docs/hazmat/backends/commoncrypto.rst11
-rw-r--r--docs/hazmat/backends/openssl.rst11
2 files changed, 20 insertions, 2 deletions
diff --git a/docs/hazmat/backends/commoncrypto.rst b/docs/hazmat/backends/commoncrypto.rst
index af2032b6..16a61337 100644
--- a/docs/hazmat/backends/commoncrypto.rst
+++ b/docs/hazmat/backends/commoncrypto.rst
@@ -11,7 +11,16 @@ The `CommonCrypto`_ C library provided by Apple on OS X and iOS.
.. data:: cryptography.hazmat.backends.commoncrypto.backend
- This is the exposed API for the CommonCrypto backend. It has one public attribute.
+ This is the exposed API for the CommonCrypto backend.
+
+ It implements the following interfaces:
+
+ * :class:`~cryptography.hazmat.backends.interfaces.CipherBackend`
+ * :class:`~cryptography.hazmat.backends.interfaces.HashBackend`
+ * :class:`~cryptography.hazmat.backends.interfaces.HMACBackend`
+ * :class:`~cryptography.hazmat.backends.interfaces.PBKDF2HMACBackend`
+
+ It has one additional public attribute.
.. attribute:: name
diff --git a/docs/hazmat/backends/openssl.rst b/docs/hazmat/backends/openssl.rst
index 12d2d9f6..4db3972d 100644
--- a/docs/hazmat/backends/openssl.rst
+++ b/docs/hazmat/backends/openssl.rst
@@ -7,7 +7,16 @@ The `OpenSSL`_ C library.
.. data:: cryptography.hazmat.backends.openssl.backend
- This is the exposed API for the OpenSSL backend. It has one public attribute.
+ This is the exposed API for the OpenSSL backend.
+
+ It implements the following interfaces:
+
+ * :class:`~cryptography.hazmat.backends.interfaces.CipherBackend`
+ * :class:`~cryptography.hazmat.backends.interfaces.HashBackend`
+ * :class:`~cryptography.hazmat.backends.interfaces.HMACBackend`
+ * :class:`~cryptography.hazmat.backends.interfaces.PBKDF2HMACBackend`
+
+ It has one additional public attribute.
.. attribute:: name