diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-02-14 11:54:39 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-02-14 11:54:39 -0800 |
| commit | 0965eaa65d194244b594f7098eb5192a2bbf8484 (patch) | |
| tree | 17a6028dc81e3f8bf186650e6caa7c2e56e42bcb /sites/www | |
| parent | fb786bea9cff8fba3c6852d216dbbcbafbbb524f (diff) | |
| parent | 4e9af2f7ca91613ea4c60ca22b96adc2247b1ba2 (diff) | |
Merge branch '1.11' into 1.12
Conflicts:
paramiko/hostkeys.py
sites/www/changelog.rst
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index ffacf6e9..8c28bebf 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +* :bug:`-` Use constant-time hash comparison operations where possible, to + protect against `timing-based attacks + <http://codahale.com/a-lesson-in-timing-attacks/>`_. Thanks to Alex Gaynor + for the patch. * :release:`1.12.2 <2014-02-14>` * :release:`1.11.4 <2014-02-14>` * :release:`1.10.6 <2014-02-14>` |