aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-01-20 13:38:36 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-01-20 13:38:36 -0600
commit1de55b76b12d7ade3e19f2c8e094695201d1523f (patch)
tree2e4537ec44634106da56a0bf38beab667e480dc4 /docs/hazmat
parent5ab6a208c46f1de6e261646a0ad34482ea755922 (diff)
parentcd10571261ad24dcd0dc63c9703289faccd841a8 (diff)
downloadcryptography-1de55b76b12d7ade3e19f2c8e094695201d1523f.tar.gz
cryptography-1de55b76b12d7ade3e19f2c8e094695201d1523f.tar.bz2
cryptography-1de55b76b12d7ade3e19f2c8e094695201d1523f.zip
Merge branch 'master' into commoncrypto-cipher-backend
* master: expand tox backend example On OS X at build time compile the CC bindings fix docs update docs for name attribute revert fixture decorator for now, switch to append. no more globals docs for explicit backend selection and document name attribute of backend modify backend selection to allow multiple backends via comma delimiter better name for the variable don't mutate _ALL_BACKENDS pass posargs via tox so --backend can be used for tox envs support --backend as a pytest flag to limit to one backend for testing
Diffstat (limited to 'docs/hazmat')
-rw-r--r--docs/hazmat/backends/openssl.rst6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/hazmat/backends/openssl.rst b/docs/hazmat/backends/openssl.rst
index 404573a3..a1f2d28a 100644
--- a/docs/hazmat/backends/openssl.rst
+++ b/docs/hazmat/backends/openssl.rst
@@ -7,7 +7,11 @@ The `OpenSSL`_ C library.
.. data:: cryptography.hazmat.backends.openssl.backend
- This is the exposed API for the OpenSSL backend. It has no public attributes.
+ This is the exposed API for the OpenSSL backend. It has one public attribute.
+
+ .. attribute:: name
+
+ The string name of this backend: ``"openssl"``
Using your own OpenSSL on Linux
-------------------------------