diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 20:47:30 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 20:47:30 -0800 |
| commit | 26b915f6ba2c54ff4534f1801f2eac1d0a822a93 (patch) | |
| tree | 297cd109636a20c1aad4b4023531b46bc3545a4e | |
| parent | 748772e1f1e853466404978cf1269f6dd79b7fcb (diff) | |
| parent | 844790306e523c9aa6ec8cdabef78ef03884fbbb (diff) | |
Merge branch '1.17' into 1.18
| -rw-r--r-- | paramiko/pkey.py | 3 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/paramiko/pkey.py b/paramiko/pkey.py index e95d60ba..7f32c8a5 100644 --- a/paramiko/pkey.py +++ b/paramiko/pkey.py @@ -318,8 +318,7 @@ class PKey (object): :raises IOError: if there was an error writing the file. """ - with open(filename, 'w', o600) as f: - # grrr... the mode doesn't always take hold + with open(filename, 'w') as f: os.chmod(filename, o600) self._write_private_key(tag, f, data, password) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 0ceca078..7884b044 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,11 @@ Changelog ========= +* :bug:`824` Fix the implementation of ``PKey.write_private_key_file`` (this + method is only publicly defined on subclasses; the fix was in the private + real implementation) so it passes the correct params to ``open()``. This bug + apparently went unnoticed and unfixed for 12 entire years. Congrats to John + Villalovos for noticing & submitting the patch! * :support:`801 (1.17+)` Skip a Unix-only test when on Windows; thanks to Gabi Davar. * :support:`792 (1.17+)` Minor updates to the README and demos; thanks to Alan |