diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-11 20:04:37 -0600 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-11 20:04:37 -0600 |
commit | 23d569e1eb03c44688f91377223e97df53291c13 (patch) | |
tree | 36686e8cd298b0e883a72562f6d4715bf102d8ed /docs/security.rst | |
parent | b53e5a05f199b48de9f2f52afd29be4b9c876595 (diff) | |
parent | fa4700006ea1eb45387f2f4f0493ad07f78d1ad9 (diff) | |
download | cryptography-23d569e1eb03c44688f91377223e97df53291c13.tar.gz cryptography-23d569e1eb03c44688f91377223e97df53291c13.tar.bz2 cryptography-23d569e1eb03c44688f91377223e97df53291c13.zip |
Merge branch 'master' into common-crypto-backend
* master:
Use pytest.fixture for backends
drop to >= 0.8 to make pypy happy
change to anonymous enum
require cffi >= 0.8.1
remove extraneous spaces
add hmac to commoncrypto binding
bytes byte back
add check to confirm we've loaded error strings
Bind all the PEM errors
Spelling!
oops, bytes plz
don't leak a context in the test
add tests to the openssl backend to verify that we've registered
Nonsense I think we need.
This is a dep
init the ssl library in the backend
Actuall install a thing
Try to run the spellchecker on travis
Use a normal quote here, not sure where the smart quote came from
Expose ERR_load_SSL_strings
Diffstat (limited to 'docs/security.rst')
-rw-r--r-- | docs/security.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/security.rst b/docs/security.rst index 88959709..4dadc847 100644 --- a/docs/security.rst +++ b/docs/security.rst @@ -7,6 +7,6 @@ identified a security issue in it, please report it to fingerprint ``E27D 4AA0 1651 72CB C5D2 AF2B 125F 5C67 DFE9 4084`` (this public key is available from most commonly-used key servers). -Once you’ve submitted an issue via email, you should receive an acknowledgment +Once you've submitted an issue via email, you should receive an acknowledgment within 48 hours, and depending on the action to be taken, you may receive -further followup emails. +further follow-up emails. |