diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-28 19:00:49 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-28 19:00:49 -0600 |
| commit | 91a6892dde4b2370047547097ac47763a62ed5f0 (patch) | |
| tree | 1627f89b2525aa0893d7ad2411a84866885287fc /docs | |
| parent | aad090fe4273ee80b28f4dc6d1b56cce483c85f7 (diff) | |
| parent | 79777fbfb521154cae072f75970aa53099835edd (diff) | |
| download | cryptography-91a6892dde4b2370047547097ac47763a62ed5f0.tar.gz cryptography-91a6892dde4b2370047547097ac47763a62ed5f0.tar.bz2 cryptography-91a6892dde4b2370047547097ac47763a62ed5f0.zip | |
Merge branch 'master' into pbkdf2-openssl
* master:
Add this to the changelog
Conflicts:
docs/changelog.rst
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/changelog.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst index cc0aacd3..be42b5db 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -12,6 +12,8 @@ Changelog :class:`~cryptography.hazmat.backends.interfaces.CipherBackend`. * Added support for the OpenSSL backend under Windows. * Improved thread-safety for the OpenSSL backend. +* Fixed compilation on systems where OpenSSL's ``ec.h`` header is not + available, such as CentOS. * Added PBKDF2HMAC support to OpenSSL backend. 0.1 - 2014-01-08 |