diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-04-14 18:54:32 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-04-14 18:54:32 -0400 |
| commit | e05276b6ab28cb4624d07e2ec8f4f698edb4b27e (patch) | |
| tree | 20bd6ae851f23abe31feeb36987f28c03dd1f118 | |
| parent | d02ae566014c6d79f61f7538c979d6560c1de629 (diff) | |
| parent | 6dee34648ed7d910464c7f2bbc27f361c9fe6d71 (diff) | |
| download | paramiko-e05276b6ab28cb4624d07e2ec8f4f698edb4b27e.tar.gz | |
Merge branch '1.13'
Conflicts:
sites/www/changelog.rst
| -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 5d46fc5f..1901596d 100644 --- a/paramiko/dsskey.py +++ b/paramiko/dsskey.py @@ -113,9 +113,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 2c4c1cf7..cedc44f8 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:`299` Use deterministic signatures for ECDSA keys for improved security. Thanks to Alex Gaynor. * :support:`297` Replace PyCrypto's ``Random`` with `os.urandom` for improved |