diff options
author | Erik Trauschke <erik.trauschke@gmail.com> | 2015-09-25 08:17:13 -0700 |
---|---|---|
committer | Erik Trauschke <erik.trauschke@gmail.com> | 2015-09-25 08:17:13 -0700 |
commit | f1e0c30d143f31e4562a7bb9cc5b3d43354da681 (patch) | |
tree | 40f4a74bb2badabf4d852e4ac41434ac5a4373f9 /docs/hazmat/bindings/openssl.rst | |
parent | dc57040a59ce4211a6ab6db843c497a87a825509 (diff) | |
parent | 1bcc7dad52619e2ce9e56d1b2cc20ec195276f43 (diff) | |
download | cryptography-f1e0c30d143f31e4562a7bb9cc5b3d43354da681.tar.gz cryptography-f1e0c30d143f31e4562a7bb9cc5b3d43354da681.tar.bz2 cryptography-f1e0c30d143f31e4562a7bb9cc5b3d43354da681.zip |
Merge branch 'master' into crl_ossl_backend
Diffstat (limited to 'docs/hazmat/bindings/openssl.rst')
-rw-r--r-- | docs/hazmat/bindings/openssl.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/hazmat/bindings/openssl.rst b/docs/hazmat/bindings/openssl.rst index 446c450c..0ec0a3d6 100644 --- a/docs/hazmat/bindings/openssl.rst +++ b/docs/hazmat/bindings/openssl.rst @@ -37,7 +37,7 @@ Threading ``cryptography`` enables OpenSSLs `thread safety facilities`_ in two different ways depending on the configuration of your system. Normally the locking callbacks provided by your Python implementation specifically for OpenSSL will -be used. However if you have linked ``cryptography`` to a different version of +be used. However, if you have linked ``cryptography`` to a different version of OpenSSL than that used by your Python implementation we enable an alternative locking callback. This version is implemented in Python and so may result in lower performance in some situations. In particular parallelism is reduced |