diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-02-16 09:25:58 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-02-16 09:25:58 +0100 |
| commit | d158a494608cbc914df9b49e8a994f6e5bfaef2b (patch) | |
| tree | 9efcded8650ac723bdecdeaa1f5bdae3519b2348 /lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key.pub | |
| parent | 8c808dc165b823c21b3496dfe56d35a65f9727e1 (diff) | |
| parent | 4d9dd06871d268942df763e556a0afb0bb6cf471 (diff) | |
| download | otp-d158a494608cbc914df9b49e8a994f6e5bfaef2b.tar.gz otp-d158a494608cbc914df9b49e8a994f6e5bfaef2b.tar.bz2 otp-d158a494608cbc914df9b49e8a994f6e5bfaef2b.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
Remove unused files from test data as it is confusing
Add support for key files protected by pass phrases
Diffstat (limited to 'lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key.pub')
| -rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key.pub | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key.pub b/lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key.pub deleted file mode 100644 index 75d2025c71..0000000000 --- a/lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key.pub +++ /dev/null @@ -1,5 +0,0 @@ ----- BEGIN SSH2 PUBLIC KEY ---- -AAAAB3NzaC1yc2EAAAADAQABAAAAgQDCZX+4FBDwZIh9y/Uxee1VJnEXlowpz2yDKwj8 -semM4q843337zbNfxHmladB1lpz2NqyxI175xMIJuDxogyZdsOxGnFAzAnthR4dqL/RW -RWzjaxSB6IAO9SPYVVlrpZ+1hsjLW79fwXK/yc8VdhRuWTeQiRgYY2ek8+OKbOqz4Q== ----- END SSH2 PUBLIC KEY ---- |