diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-05 15:44:08 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-05 15:44:08 -0600 |
| commit | c91f2392f9cd5b63e1d0440ce851db768944964a (patch) | |
| tree | b21a3eab441b72ef3b1f1fe5545a8895c9c32702 /docs/hazmat/backends/multibackend.rst | |
| parent | 27864789563c90edb42772a9af1602be87029abc (diff) | |
| parent | f970eaa676eb0cd89cdb2389f03d365899812822 (diff) | |
| download | cryptography-c91f2392f9cd5b63e1d0440ce851db768944964a.tar.gz cryptography-c91f2392f9cd5b63e1d0440ce851db768944964a.tar.bz2 cryptography-c91f2392f9cd5b63e1d0440ce851db768944964a.zip | |
Merge branch 'master' into urandom-engine
* master:
PKCS #1 RSA test vector loader
Removed pointless anchor
Docs need virtualenv as well
Everything about bash is the worst
Some reST markup nonsense
Fix for OS X
More clearly describe the behavior of constant_time.bytes_eq
Run the doc tests under OS X
Made OpenSSL's derive_pbkdf2_hmac raise the right exception
Document which backends implement which itnerfaces. Fixes #538
pep8
Fixed a typo in the docs
Make the default backend be a multi-backend
Conflicts:
tests/hazmat/backends/test_openssl.py
Diffstat (limited to 'docs/hazmat/backends/multibackend.rst')
| -rw-r--r-- | docs/hazmat/backends/multibackend.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/hazmat/backends/multibackend.rst b/docs/hazmat/backends/multibackend.rst index 63177bef..95538ac8 100644 --- a/docs/hazmat/backends/multibackend.rst +++ b/docs/hazmat/backends/multibackend.rst @@ -18,10 +18,10 @@ MultiBackend >>> from cryptography.hazmat.primitives import hashes >>> backend1.hash_supported(hashes.SHA256()) False - >>> backend2.hash_supported(hashes.SHA1()) + >>> backend2.hash_supported(hashes.SHA256()) True >>> multi_backend = MultiBackend([backend1, backend2]) - >>> multi_backend.hash_supported(hashes.SHA1()) + >>> multi_backend.hash_supported(hashes.SHA256()) True :param backends: A ``list`` of backend objects. Backends are checked for |