summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-12-05 20:47:30 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-12-05 20:47:30 -0800
commit8636ab06e37f8f46384d8f8d45fe0ad779c8effd (patch)
tree42deca4b068772c2e047a51a924bb34c2e0c12ab
parent0ccca706da838f527efc081b9e1aef35e21d86c8 (diff)
parent491d4a758264618bf236e8183d377fa4be7c6433 (diff)
Merge branch '2.0'
-rw-r--r--paramiko/pkey.py3
-rw-r--r--sites/www/changelog.rst5
2 files changed, 6 insertions, 2 deletions
diff --git a/paramiko/pkey.py b/paramiko/pkey.py
index 0637a6f0..c87daaed 100644
--- a/paramiko/pkey.py
+++ b/paramiko/pkey.py
@@ -333,8 +333,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(f, key, format)
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 3f827599..c715b7bf 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