diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-04-14 18:52:43 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-04-14 18:52:43 -0400 |
| commit | 6dee34648ed7d910464c7f2bbc27f361c9fe6d71 (patch) | |
| tree | f3ca30ce1dc6e69a982479b405f3f05dfa437382 | |
| parent | ab08ef6651dcb61d32d228106673f00e3e47bde7 (diff) | |
| parent | 34d03ae3dc4f08657f638e85c4184fb3b1a64e64 (diff) | |
| download | paramiko-6dee34648ed7d910464c7f2bbc27f361c9fe6d71.tar.gz | |
Merge pull request #310 from offbyone/fix-sporadic-test-failures
Revert a regression in DSS key generation
| -rw-r--r-- | paramiko/dsskey.py | 4 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py index c26966e8..6a46d326 100644 --- a/paramiko/dsskey.py +++ b/paramiko/dsskey.py @@ -111,9 +111,9 @@ class DSSKey (PKey): rstr = util.deflate_long(r, 0) sstr = util.deflate_long(s, 0) if len(rstr) < 20: - rstr += zero_byte * (20 - len(rstr)) + rstr = zero_byte * (20 - len(rstr)) + rstr if len(sstr) < 20: - sstr += zero_byte * (20 - len(sstr)) + sstr = zero_byte * (20 - len(sstr)) + sstr m.add_string(rstr + sstr) return m diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 02fee80b..6737fdc0 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,8 @@ Changelog ========= +* :bug:`308` Fix regression in dsskey.py that caused sporadic signature + verification failures. Thanks to Chris Rose. * :support:`290` (also :issue:`292`) Add support for building universal (Python 2+3 compatible) wheel files during the release process. Courtesy of Alex Gaynor. |