diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-11-04 10:10:16 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-11-04 10:10:16 -0500 |
| commit | 30a7afcdc74443c74f2ebb344a1fbf235c23bf57 (patch) | |
| tree | 8d4acdf8a79ae564cfe16e9336ea8455a86f73af /tests/test_hostkeys.py | |
| parent | 9e67e71377cea9adaaeab6dbb024f2af94ba7999 (diff) | |
| parent | 4565fb517ceb54aa994ff96380b2c8f24df43968 (diff) | |
Merge branch 'master' into switch-to-cryptography
Conflicts:
.travis.yml
paramiko/ecdsakey.py
paramiko/transport.py
Diffstat (limited to 'tests/test_hostkeys.py')
| -rw-r--r-- | tests/test_hostkeys.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/test_hostkeys.py b/tests/test_hostkeys.py index 0ee1bbf0..2bdcad9c 100644 --- a/tests/test_hostkeys.py +++ b/tests/test_hostkeys.py @@ -31,6 +31,7 @@ test_hosts_file = """\ secure.example.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1PD6U2/TVxET6lkpKhOk5r\ 9q/kAYG6sP9f5zuUYP8i7FOFp/6ncCEbbtg/lB+A3iidyxoSWl+9jtoyyDOOVX4UIDV9G11Ml8om3\ D+jrpI9cycZHqilK0HmxDeCuxbwyMuaCygU9gS2qoRvNLWZk70OpIKSSpBo0Wl3/XUmz9uhc= +broken.example.com ssh-rsa AAAA happy.example.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA8bP1ZA7DCZDB9J0s50l31M\ BGQ3GQ/Fc7SX6gkpXkwcZryoi4kNFhHu5LvHcZPdxXV1D+uTMfGS1eyd2Yz/DoNWXNAl8TI0cAsW\ 5ymME3bQ4J/k1IKxCtz/bAlAqFgKoc+EolMziDYqWIATtW0rYTJvzGAzTmMj80/QpsFH+Pc2M= |