diff options
| author | Niclas Eklund <[email protected]> | 2010-12-20 17:05:39 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2010-12-20 17:05:39 +0100 |
| commit | 4e894385dba69227fde6a5b402b169ec4621a356 (patch) | |
| tree | c7f28fc7c5245c4cab6d351f7569af5255473067 /lib/ssh/src/ssh_file.erl | |
| parent | 8a1ec022a6395ce6c228c6776dc12bff4f3967cf (diff) | |
| download | otp-4e894385dba69227fde6a5b402b169ec4621a356.tar.gz otp-4e894385dba69227fde6a5b402b169ec4621a356.tar.bz2 otp-4e894385dba69227fde6a5b402b169ec4621a356.zip | |
OTP-8987
In some cases SSH returned {error, normal} when a channel was terminated
unexpectedly. This has now been changed to {error, channel_closed}.
OTP-8986
It is now possible to use SSH to sign and verify binary data.
Diffstat (limited to 'lib/ssh/src/ssh_file.erl')
| -rwxr-xr-x | lib/ssh/src/ssh_file.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl index 13722656db..cd0d01c546 100755 --- a/lib/ssh/src/ssh_file.erl +++ b/lib/ssh/src/ssh_file.erl @@ -33,8 +33,8 @@ lookup_host_key/3, add_host_key/3, % del_host_key/2, lookup_user_key/3, ssh_dir/2, file_name/3]). --export([private_identity_key/2]). -%% , public_identity_key/2, +-export([private_identity_key/2, + public_identity_key/2]). %% identity_keys/2]). -export([encode_public_key/1, decode_public_key_v2/2]). @@ -140,6 +140,11 @@ private_identity_key(Alg, Opts) -> Path = file_name(user, identity_key_filename(Alg), Opts), read_private_key_v2(Path, Alg). +public_identity_key(Alg, Opts) -> + Path = file_name(user, identity_key_filename(Alg) ++ ".pub", Opts), + read_public_key_v2(Path, Alg). + + read_public_key_v2(File, Type) -> case file:read_file(File) of {ok,Bin} -> |