dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '1.13' 

Conflicts:
	sites/www/changelog.rst
This commit is contained in:
Jeff Forcier 2014-04-14 18:54:32 -04:00
parent d02ae56601 6dee34648e
commit e05276b6ab
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
paramiko/dsskey.py
View File

@ -113,9 +113,9 @@ class DSSKey (PKey):
rstr = util.deflate_long(r, 0) rstr = util.deflate_long(r, 0)
sstr = util.deflate_long(s, 0) sstr = util.deflate_long(s, 0)
if len(rstr) < 20: if len(rstr) < 20:
rstr += zero_byte * (20 - len(rstr)) rstr = zero_byte * (20 - len(rstr)) + rstr
if len(sstr) < 20: if len(sstr) < 20:
sstr += zero_byte * (20 - len(sstr)) sstr = zero_byte * (20 - len(sstr)) + sstr
m.add_string(rstr + sstr) m.add_string(rstr + sstr)
return m return m

2
sites/www/changelog.rst
View File

@ -2,6 +2,8 @@
Changelog 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 * :support:`299` Use deterministic signatures for ECDSA keys for improved
security. Thanks to Alex Gaynor. security. Thanks to Alex Gaynor.
* :support:`297` Replace PyCrypto's ``Random`` with `os.urandom` for improved * :support:`297` Replace PyCrypto's ``Random`` with `os.urandom` for improved