diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:37:28 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:37:28 -0700 |
commit | 3530bc9c70e53e5bade1ca91d595172ead3530c4 (patch) | |
tree | 3da904e683995c3f0fee28b3dcc3d0393c314f7c | |
parent | 5e8e088ed610ae6dd264ea2c72fa30c3aa32b850 (diff) | |
parent | 35fa518d8b0b9c91dbd498aa20225825c428db60 (diff) | |
download | paramiko-3530bc9c70e53e5bade1ca91d595172ead3530c4.tar.gz |
Merge branch 'master' into 346-int
-rw-r--r-- | tests/test_pkey.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/test_pkey.py b/tests/test_pkey.py index 1468ee27..3d5f0326 100644 --- a/tests/test_pkey.py +++ b/tests/test_pkey.py @@ -21,6 +21,7 @@ Some unit tests for public/private key objects. """ import unittest +import os from binascii import hexlify from hashlib import md5 @@ -253,3 +254,20 @@ class KeyTest (unittest.TestCase): msg.rewind() pub = ECDSAKey(data=key.asbytes()) self.assertTrue(pub.verify_ssh_sig(b'ice weasels', msg)) + + def test_salt_size(self): + # Read an existing encrypted private key + file_ = test_path('test_rsa_password.key') + password = 'television' + newfile = file_ + '.new' + newpassword = 'radio' + key = RSAKey(filename=file_, password=password) + # Write out a newly re-encrypted copy with a new password. + # When the bug under test exists, this will ValueError. + try: + key.write_private_key_file(newfile, password=newpassword) + # Verify the inner key data still matches (when no ValueError) + key2 = RSAKey(newfile, password=newpassword) + self.assertEqual(key, key2) + finally: + os.remove(newfile) |