File 3901-ssh-Add-fingerprint-and-ssh_encode-ssh_dec... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3901-ssh-Add-fingerprint-and-ssh_encode-ssh_decode-functi.patch of Package erlang (Revision 8cb5d5fde1cca12e0e8bdc4c50dbf291)

Currently displaying revision 8cb5d5fde1cca12e0e8bdc4c50dbf291 , Show latest

From b213072d6643cc06048577a039d66d47ec76ebd7 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 26 Apr 2021 10:42:26 +0200
Subject: [PATCH 1/4] ssh: Add fingerprint and ssh_encode/ssh_decode functions
 to ssh

Copy fingerprint and encode/decode tests from pubkey to ssh + compatible api
---
 lib/ssh/src/ssh.erl                           |  55 +++
 lib/ssh/src/ssh_file.erl                      | 400 ++++++++++++---
 lib/ssh/src/ssh_message.erl                   |  66 ++-
 lib/ssh/src/ssh_transport.erl                 |  10 +-
 lib/ssh/test/ssh_options_SUITE.erl            |  12 +-
 lib/ssh/test/ssh_pubkey_SUITE.erl             | 454 +++++++++++++++++-
 .../public_key/auth_keys                      |   7 +
 .../public_key/known_hosts                    |   8 +
 .../public_key/openssh_dsa_pub                |   1 +
 .../public_key/openssh_dsa_with_comment_pub   |   3 +
 .../public_key/openssh_ecdsa_pub              |   1 +
 .../public_key/openssh_rsa_pub                |   1 +
 .../public_key/ssh1_auth_keys                 |   9 +
 .../public_key/ssh1_known_hosts               |   3 +
 .../public_key/ssh2_dsa_comment_pub           |  13 +
 .../public_key/ssh2_dsa_pub                   |  12 +
 .../public_key/ssh2_ecdsa_pub                 |   6 +
 .../public_key/ssh2_rsa_comment_pub           |   7 +
 .../public_key/ssh2_rsa_pub                   |  13 +
 .../public_key/ssh2_subject_pub               |   8 +
 .../public_key/ssh_rsa_long_comment_pub       |   9 +
 .../public_key/ssh_rsa_long_header_pub        |   9 +
 22 files changed, 1018 insertions(+), 89 deletions(-)
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/auth_keys
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/known_hosts
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_dsa_pub
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_dsa_with_comment_pub
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_ecdsa_pub
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_rsa_pub
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh1_auth_keys
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh1_known_hosts
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_dsa_comment_pub
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_dsa_pub
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_ecdsa_pub
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_rsa_comment_pub
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_rsa_pub
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_subject_pub
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh_rsa_long_comment_pub
 create mode 100644 lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh_rsa_long_header_pub

diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 867e795c11..b24df1ecf7 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -45,6 +45,11 @@
          tcpip_tunnel_to_server/5, tcpip_tunnel_to_server/6
 	]).
 
+%% In move from public_key
+-export([hostkey_fingerprint/1, hostkey_fingerprint/2
+        ]).
+         
+
 %%% Internal export
 -export([is_host/2]).
 
@@ -735,6 +740,56 @@ tcpip_tunnel_from_server(ConnectionRef, ListenHost0, ListenPort, ConnectToHost0,
             Other
     end.
 
+%%--------------------------------------------------------------------
+%% In move from public_key
+%%--------------------------------------------------------------------
+-spec hostkey_fingerprint(public_key:public_key()) -> string().
+
+hostkey_fingerprint(Key) ->
+    sshfp_string(md5, ssh_message:ssh2_pubkey_encode(Key) ).
+
+-spec hostkey_fingerprint(TypeOrTypes, Key) -> StringOrString
+                                                   when
+      TypeOrTypes :: public_key:digest_type() | [public_key:digest_type()],
+      Key :: public_key:public_key(),
+      StringOrString :: string() | [string()] .
+
+hostkey_fingerprint(HashAlgs, Key) when is_list(HashAlgs) ->
+    EncKey = ssh_message:ssh2_pubkey_encode(Key),
+    [sshfp_full_string(HashAlg,EncKey) || HashAlg <- HashAlgs];
+hostkey_fingerprint(HashAlg, Key) when is_atom(HashAlg) ->
+    EncKey = ssh_message:ssh2_pubkey_encode(Key),
+    sshfp_full_string(HashAlg, EncKey).
+
+
+sshfp_string(HashAlg, EncodedKey) ->
+    %% Other HashAlgs than md5 will be printed with
+    %% other formats than hextstr by
+    %%    ssh-keygen -E <alg> -lf <file>
+    fp_fmt(sshfp_fmt(HashAlg), crypto:hash(HashAlg, EncodedKey)).
+
+sshfp_full_string(HashAlg, EncKey) ->
+    lists:concat([sshfp_alg_name(HashAlg),
+		  [$: | sshfp_string(HashAlg, EncKey)]
+		 ]).
+
+sshfp_alg_name(sha) -> "SHA1";
+sshfp_alg_name(Alg) -> string:to_upper(atom_to_list(Alg)).
+
+sshfp_fmt(md5) -> hexstr;
+sshfp_fmt(_) -> b64.
+
+fp_fmt(hexstr, Bin) ->
+    lists:flatten(string:join([io_lib:format("~2.16.0b",[C1]) || <<C1>> <= Bin], ":"));
+fp_fmt(b64, Bin) ->
+    %% This function clause *seems* to be
+    %%    [C || C<-base64:encode_to_string(Bin), C =/= $=]
+    %% but I am not sure. Must be checked.
+    B64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
+    BitsInLast = 8*size(Bin) rem 6,
+    Padding = (6-BitsInLast) rem 6, % Want BitsInLast = [1:5] to map to padding [5:1] and 0 -> 0
+    [lists:nth(C+1,B64Chars) || <<C:6>> <= <<Bin/binary,0:Padding>> ].
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl
index 8f12b617bb..0fccbdd2fd 100644
--- a/lib/ssh/src/ssh_file.erl
+++ b/lib/ssh/src/ssh_file.erl
@@ -30,7 +30,8 @@
 -include("ssh.hrl").
 
 %% experimental:
--export([decode_ssh_file/4]).
+-export([decode_ssh_file/4
+        ]).
 
 %%%--------------------- server exports ---------------------------
 -behaviour(ssh_server_key_api).
@@ -44,10 +45,15 @@
 -export_type([pubkey_passphrase_client_options/0]).
 -type pubkey_passphrase_client_options() ::   {dsa_pass_phrase,      string()}
                                             | {rsa_pass_phrase,      string()}
-%% Not yet implemented:                     | {ed25519_pass_phrase,  string()}
-%% Not yet implemented:                     | {ed448_pass_phrase,    string()}
+                                              %% Not yet implemented:                     | {ed25519_pass_phrase,  string()}
+                                              %% Not yet implemented:                     | {ed448_pass_phrase,    string()}
                                             | {ecdsa_pass_phrase,    string()} .
 
+%%%--------------------- utility exports ---------------------------
+-export([decode/2, encode/2]).
+
+-define(ENCODED_LINE_LENGTH, 68).
+
 %%%--------------------- common exports ---------------------------
 -export_type([user_dir_common_option/0,
               user_dir_fun_common_option/0
@@ -87,7 +93,7 @@ is_auth_key(Key0, User, Opts) ->
     Key = encode_key(Key0),
     lookup_auth_keys(KeyType, Key, filename:join(Dir,"authorized_keys"), Opts)
         orelse
-    lookup_auth_keys(KeyType, Key, filename:join(Dir,"authorized_keys2"), Opts).
+        lookup_auth_keys(KeyType, Key, filename:join(Dir,"authorized_keys2"), Opts).
 
 %%%---------------- CLIENT API ------------------------------------
 -spec user_key(Algorithm, Options) -> Result when
@@ -147,6 +153,148 @@ add_host_key(Hosts0, Port, Key, Opts) ->
 	    {error,{add_host_key,Error}}
     end.
 
+%%%---------------- UTILITY API -----------------------------------
+%%% In public key before OTP-24.0 as ssh_decode/2 and ssh_encode/2
+
+-spec decode(SshBin, Type) -> Decoded
+                                  when SshBin :: binary(),
+                                       Type :: ssh2_pubkey
+                                             | public_key
+                                             | openssh_public_key
+                                             | rfc4716_public_key
+                                             | openssh_key_v1  % Experimental
+                                             | known_hosts
+                                             | auth_keys,
+                                       Decoded :: public_key:public_key()
+                                                | [{public_key:public_key(), [{headers,Attrs}]}]
+                                                | [{public_key:public_key(), [{comment,string()}]}]
+                                                | {error, term()},
+                                       Attrs :: {Key::string()|atom(), Value::string()}
+                                                .
+decode(KeyBin, ssh2_pubkey) when is_binary(KeyBin) ->
+    ssh_message:ssh2_pubkey_decode(KeyBin);
+
+decode(KeyBin, Type) when is_binary(KeyBin) andalso 
+                          (Type==rfc4716_public_key orelse
+                           Type==openssh_key_v1 % Experimental
+                          ) ->
+    %% Ex: <<"---- BEGIN SSH2 PUBLIC KEY ----\n....">>     (rfc4716_public_key)
+    %%     <<"-----BEGIN OPENSSH PRIVATE KEY-----\n....">> (openssh_key_v1)
+    case ssh_file:decode_ssh_file(public, any, KeyBin, ignore) of
+        {ok,Keys} ->
+            [{Key,
+              if
+                  Attrs =/= [] ->
+                      [{headers, [{binary_to_list(K),binary_to_list(V)} || {K,V} <- Attrs]}];
+                  Attrs == [] ->
+                      []
+              end
+             }
+             || {Key,Attrs} <- Keys];
+
+        {error,Error} ->
+            {error,Error}
+    end;
+
+decode(KeyBin0, openssh_public_key) when is_binary(KeyBin0) ->
+    %% Ex: <<"ssh-rsa AAAAB12....3BC someone@example.com">>
+    try
+        Lines = [L || L <- binary:split(KeyBin0, <<"\n">>, [global,trim_all]),
+                      re:run(L, "^\s+$") == nomatch],
+        [begin
+             [_,K|Rest] = binary:split(Line, <<" ">>, [global,trim_all]),
+             Key = ssh_message:ssh2_pubkey_decode(base64:decode(K)),
+             case Rest of
+                 [Comment] -> {Key, [{comment,binary_to_list(Comment)}]};
+                 [] -> {Key,[]}
+             end
+         end || Line <- Lines,
+                case Line of
+                    <<"#",_/binary>> -> % skip comments
+                        false;
+                    _ ->
+                        true
+                end
+        ]
+    catch
+        _:_ -> {error, key_decode_failed}
+    end;
+
+decode(KeyBin, public_key) when is_binary(KeyBin) ->
+    Type = case KeyBin of
+               <<"-----BEGIN OPENSSH",_/binary>> -> openssh_key_v1;
+               <<"----",_/binary>> -> rfc4716_public_key;
+               _ -> openssh_public_key
+           end,
+    decode(KeyBin, Type);
+
+decode(_KeyBin, Type) when Type == known_hosts;
+                           Type == auth_keys
+                           ->
+    {error, not_yet_implemented};
+
+decode(_KeyBin, _Type) ->
+    error(badarg).
+
+%%%----------------------------------------------------------------
+-spec encode(InData, Type) -> binary() | {error,term()}
+                                  when Type :: ssh2_pubkey
+                                             | openssh_public_key
+                                             | rfc4716_public_key
+                                             | openssh_key_v1  % Experimental
+                                             | known_hosts
+                                             | auth_keys,
+                                       InData :: public_key:public_key()
+                                               | [{public_key:public_key(), [{headers,Attrs}]}]
+                                               | [{public_key:public_key(), [{comment,string()}]}]
+                                               | {error, term()},
+                                       Attrs :: {Key::string()|atom(), Value::string()}
+                                                .
+encode(Key, ssh2_pubkey) ->
+    ssh_message:ssh2_pubkey_encode(Key);
+
+encode(KeyAttrs, Type) when Type==rfc4716_public_key ;
+                            Type==openssh_key_v1 % Experimental
+                            ->
+    {Begin, End, F} =
+        case Type of
+            rfc4716_public_key ->
+                {"---- BEGIN SSH2 PUBLIC KEY ----\n",
+                 "---- END SSH2 PUBLIC KEY ----\n",
+                 fun ssh_message:ssh2_pubkey_encode/1};
+            openssh_key_v1 ->
+                {"-----BEGIN OPENSSH PRIVATE KEY-----\n",
+                 "-----END OPENSSH PRIVATE KEY-----\n",
+                 fun openssh_key_v1_encode/1}
+        end,
+    iolist_to_binary(
+      [
+       [Begin,
+        [rfc4716_encode_header(H) || H <- proplists:get_value(headers, Attrs, [])],
+        split_lines( base64:encode( F(Key) ) ),
+        "\n",
+        End
+       ] ||
+          {Key,Attrs} <- KeyAttrs
+      ]
+     );
+
+encode(KeyAttrs, openssh_public_key) ->
+    iolist_to_binary(
+      [begin
+           <<?DEC_BIN(KeyType,__0),_/binary>> = Enc0 = ssh_message:ssh2_pubkey_encode(Key),
+           [KeyType, " ",  base64:encode(Enc0),  " ", proplists:get_value(comment,Attrs,""), "\n"]
+       end ||
+          {Key,Attrs} <- KeyAttrs
+      ]);
+
+encode(_KeyBin, Type) when Type == known_hosts;
+                           Type == auth_keys
+                           ->
+    {error, not_yet_implemented};
+encode(_KeyBin, _Type) ->
+    error(badarg).
+
 %%%================================================================
 %%%
 %%% Local functions
@@ -216,7 +364,7 @@ normalize_hosts_list(Hosts, Port) when is_list(hd(Hosts)) ->
                           Hs = case Port of
                                    22 -> H1s;
                                    _ -> [lists:concat(["[",Hx,"]:",Port]) || Hx <- H1s]
-                              end,
+                               end,
                           lists:foldl(
                             fun(Hy, Acc2) ->
                                     case lists:member(Hy, Acc2) of
@@ -283,7 +431,7 @@ read_test_loop(Fd, Test) ->
                     read_test_loop(Fd, Test)
             end
     end.
-                    
+
 %%%--------------------------------
 
 lookup_host_keys(Hosts, KeyType, Key, File, Opts) ->
@@ -412,7 +560,7 @@ line_match(_, _, _, _) ->
 host_match(Hosts, Patterns) ->
     PatternList = binary:split(Patterns, <<",">>, [global]),
     host_matchL(Hosts, PatternList).
-    
+
 host_matchL([H|Hosts], Patterns) ->
     case one_host_match(H, Patterns) of
         true ->
@@ -471,6 +619,35 @@ pos_match(H, P) ->
             false
     end.
 
+%%%---------------- UTILITY ---------------------------------------
+rfc4716_encode_header({Tag, Value}) ->
+    TagLen = length(Tag),
+    ValueLen = length(Value),
+    case TagLen + 1 + ValueLen of
+	N when N > ?ENCODED_LINE_LENGTH ->
+	    NumOfChars =  ?ENCODED_LINE_LENGTH - (TagLen + 1),
+	    {First, Rest} = lists:split(NumOfChars, Value),
+	    [Tag,": " , First, [$\\], "\n", rfc4716_encode_value(Rest) , "\n"];
+	_ ->
+	    [Tag, ": ", Value, "\n"]
+    end.
+
+rfc4716_encode_value(Value) ->
+    case length(Value) of
+	N when N > ?ENCODED_LINE_LENGTH ->
+	    {First, Rest} = lists:split(?ENCODED_LINE_LENGTH, Value),
+	    [First, [$\\], "\n", rfc4716_encode_value(Rest)];
+	_ ->
+	    Value
+    end.
+
+split_lines(<<Text:?ENCODED_LINE_LENGTH/binary>>) ->
+    [Text];
+split_lines(<<Text:?ENCODED_LINE_LENGTH/binary, Rest/binary>>) ->
+    [Text, $\n | split_lines(Rest)];
+split_lines(Bin) ->
+    [Bin].
+
 %%%---------------- COMMON FUNCTIONS ------------------------------
 
 assure_file_mode(File, user_write) -> assure_file_mode(File, 8#200);
@@ -516,7 +693,7 @@ read_ssh_key_file(Role, PrivPub, Algorithm, Opts) ->
             try
                 decode_ssh_file(PrivPub, Algorithm, Pem, Password)
             of
-                {ok, [Key|_Keys]} ->
+                {ok, [{Key,_Attrs}|_Keys]} ->
                     {ok,Key};
                 {error, Reason} ->
                     {error, Reason}
@@ -534,19 +711,23 @@ read_ssh_key_file(Role, PrivPub, Algorithm, Opts) ->
 
 -spec decode_ssh_file(PrivPub, Algorithm, Pem, Password) -> Result when
       PrivPub :: private | public,
-      Algorithm :: ssh:pubkey_alg(),
+      Algorithm :: ssh:pubkey_alg() | any,
       Pem :: binary(),
-      Password :: string(),
+      Password :: string() | ignore,
       Result :: {ok, Keys} | {error, any()},
-      Keys :: [Key],
+      Keys :: [{Key,Attrs}],
+      Attrs :: [{any(),any()}],
       Key :: public_key:private_key() | public_key:public_key() .
-                             
+
 decode_ssh_file(PrivPub, Algorithm, Pem, Password) ->
     try decode_pem_keys(Pem, Password)
     of
+        {ok, Keys} when Algorithm == any ->
+            {ok, Keys};
+
         {ok, Keys0} ->
-            case [Key || Key <- Keys0,
-                         ssh_transport:valid_key_sha_alg(PrivPub, Key, Algorithm)] of
+            case [{Key,Attrs} || {Key,Attrs} <- Keys0,
+                                 ssh_transport:valid_key_sha_alg(PrivPub, Key, Algorithm)] of
                 [] ->
                     {error,no_key_found};
                 Keys ->
@@ -561,26 +742,49 @@ decode_ssh_file(PrivPub, Algorithm, Pem, Password) ->
             {error, key_decode_failed}
     end.
 
-decode_pem_keys(Pem, Password) ->
+
+decode_pem_keys(RawBin, Password) ->
+    PemLines = binary:split(
+                 binary:replace(RawBin, <<"\\\n">>, <<"">>, [global]),
+                 <<"\n">>, [global,trim_all]),
+    decode_pem_keys(PemLines, Password, []).
+decode_pem_keys([], _, Acc) ->
+    {ok,lists:reverse(Acc)};
+
+
+decode_pem_keys(PemLines, Password, Acc) ->
     %% Private Key
-    try get_key_part(Pem) of
-        {'openssh-key-v1', Bin, _KeyValues} ->
+    try get_key_part(PemLines) of
+        {'openssh-key-v1', Bin, Attrs, RestLines} ->
+            %% -----BEGIN OPENSSH PRIVATE KEY-----
             %% Holds both public and private keys
-            KeyPairs = new_openssh_decode(Bin, Password),
-            Keys = [Key || {Pub,Priv} <- KeyPairs,
-                           Key <- [Pub,Priv]],
-            {ok,Keys};
-
-        {rfc4716, Bin, _KeyValues} ->
+            KeyPairs = openssh_key_v1_decode(Bin, Password),
+            Keys = [{Key,Attrs} || {Pub,Priv} <- KeyPairs,
+                                   Key <- [Pub,Priv]],
+            decode_pem_keys(RestLines, Password, Keys ++ Acc);
+
+        %% {'openssh-key-v1', Bin, Attrs, RestLines} ->
+        %%     %% -----BEGIN OPENSSH PRIVATE KEY-----
+        %%     %% Holds both public and private keys
+        %%     KeyPairsCmnts = openssh_key_v1_decode(Bin, Password),
+        %%     %% Keys = [{Key,{Attrs,Cmnt}} || {Pub,Priv,Cmnt} <- KeyPairsCmnts,
+        %%     %%                             Key <- [Pub,Priv]],
+        %%     decode_pem_keys(RestLines, Password, [{KeyPairsCmnts,Attrs}| Acc]);
+
+
+        {rfc4716, Bin, Attrs, RestLines} ->
+            %% ---- BEGIN SSH2 PUBLIC KEY ----
             %% rfc4716 only defines public keys
             Key = ssh_message:ssh2_pubkey_decode(Bin),
-            {ok,[Key]};
+            decode_pem_keys(RestLines, Password, [{Key,Attrs}|Acc]);
 
-        {Type, Bin, KeyValues} ->
-            case get_encrypt_hdrs(KeyValues) of
+        {Type, Bin, Attrs, RestLines} ->
+            %% -----BEGIN (RSA|DSA|EC) PRIVATE KEY-----
+            %% and possibly others
+            case get_encrypt_hdrs(Attrs) of
                 not_encrypted ->
                     Key = public_key:pem_entry_decode({Type,Bin,not_encrypted}),
-                    {ok, [Key]};
+                    decode_pem_keys(RestLines, Password, [{Key,Attrs}|Acc]);
 
                 [Cipher,Salt] when is_binary(Cipher),
                                    is_binary(Salt),
@@ -588,7 +792,7 @@ decode_pem_keys(Pem, Password) ->
                     CryptInfo =
                         {binary_to_list(Cipher), unhex(binary_to_list(Salt))},
                     Key = public_key:pem_entry_decode({Type,Bin,CryptInfo}, Password),
-                    {ok, [Key]};
+                    decode_pem_keys(RestLines, Password, [{Key,Attrs}|Acc]);
 
                 _X ->
                     {error, no_pass_phrase}
@@ -697,25 +901,21 @@ default_user_dir(Home) when is_list(Home) ->
     UserDir.
 
 %%%################################################################
-get_key_part(RawBin) when is_binary(RawBin) ->
-    case binary:split(
-           binary:replace(RawBin, <<"\\\n">>, <<"">>, [global]),
-           <<"\n">>, [global,trim_all])
-    of
-        [<<"---- BEGIN SSH2 PUBLIC KEY ----">> | Lines0] ->
-            %% RFC 4716 format
-            {KeyValues,Lines} = get_hdr_lines(Lines0, []),
-            ExpectedEndLine = <<"---- END SSH2 PUBLIC KEY ----">>,
-            {rfc4716, get_body(Lines,ExpectedEndLine), KeyValues};
-
-        [<<"-----BEGIN ", Rest/binary>> | Lines0] ->
-            %% PEM format
-            ExpectedEndLine = <<"-----END ",Rest/binary>>,
-            [MiddlePart, <<>>] = binary:split(Rest,  <<" KEY-----">>),
-            {KeyValues,Lines} = get_hdr_lines(Lines0, []),
-            {asn1_type(MiddlePart), get_body(Lines,ExpectedEndLine), KeyValues}
-    end.
-            
+get_key_part([<<"---- BEGIN SSH2 PUBLIC KEY ----">> | Lines0]) ->
+    %% RFC 4716 format
+    {KeyValues,Lines} = get_hdr_lines(Lines0, []),
+    ExpectedEndLine = <<"---- END SSH2 PUBLIC KEY ----">>,
+    {Key,RestLines} = get_body(Lines,ExpectedEndLine),
+    {rfc4716, Key, KeyValues, RestLines};
+
+get_key_part([<<"-----BEGIN ", Rest/binary>> | Lines0]) ->
+    %% PEM format
+    ExpectedEndLine = <<"-----END ",Rest/binary>>,
+    [MiddlePart, <<>>] = binary:split(Rest,  <<" KEY-----">>),
+    {KeyValues,Lines} = get_hdr_lines(Lines0, []),
+    {Key,RestLines} = get_body(Lines,ExpectedEndLine),
+    {asn1_type(MiddlePart), Key, KeyValues, RestLines}.
+
 
 get_hdr_lines(Lines, Acc) ->
     Line1 = hd(Lines),
@@ -728,8 +928,9 @@ get_hdr_lines(Lines, Acc) ->
 
 
 get_body(Lines, ExpectedEndLine) ->
-    {KeyPart, [ExpectedEndLine]} = lists:split(length(Lines)-1, Lines),
-    base64:mime_decode(iolist_to_binary(KeyPart)).
+    {KeyPart, [ExpectedEndLine|RestLines]} = 
+        lists:splitwith(fun(L) -> L=/=ExpectedEndLine end, Lines),
+    {base64:mime_decode(iolist_to_binary(KeyPart)), RestLines}.
 
 trim(<<" ",B/binary>>) -> trim(B);
 trim(B) -> B.
@@ -747,26 +948,27 @@ asn1_type(_) -> undefined.
 
 -define(NON_CRYPT_BLOCKSIZE, 8).
 
-new_openssh_decode(<<"openssh-key-v1",0,
-                     ?DEC_BIN(CipherName, _L1),
-                     ?DEC_BIN(KdfName, _L2),
-                     ?DEC_BIN(KdfOptions, _L3),
-                     ?UINT32(N),      % number of keys
-                     Rest/binary
-                   >>, Pwd) ->
-    new_openssh_decode(Rest, N, Pwd, CipherName, KdfName, KdfOptions, N, []).
+openssh_key_v1_decode(<<"openssh-key-v1",0,
+                        ?DEC_BIN(CipherName, _L1),
+                        ?DEC_BIN(KdfName, _L2),
+                        ?DEC_BIN(KdfOptions, _L3),
+                        ?UINT32(N),      % number of keys
+                        Rest/binary
+                      >>, Pwd) ->
+    openssh_key_v1_decode(Rest, N, Pwd, CipherName, KdfName, KdfOptions, N, []).
 
 
-new_openssh_decode(<<?DEC_BIN(BinKey,_L1), Rest/binary>>, I, Pwd, CipherName, KdfName, KdfOptions, N, PubKeyAcc) when I>0 ->
+openssh_key_v1_decode(<<?DEC_BIN(BinKey,_L1), Rest/binary>>, I,
+                      Pwd, CipherName, KdfName, KdfOptions, N, PubKeyAcc) when I>0 ->
     PublicKey = ssh_message:ssh2_pubkey_decode(BinKey),
-    new_openssh_decode(Rest, I-1, Pwd, CipherName, KdfName, KdfOptions, N, [PublicKey|PubKeyAcc]);
+    openssh_key_v1_decode(Rest, I-1, Pwd, CipherName, KdfName, KdfOptions, N, [PublicKey|PubKeyAcc]);
 
-new_openssh_decode(<<?DEC_BIN(Encrypted,_L)>>,
-                   0, Pwd, CipherName, KdfName, KdfOptions, N, PubKeyAccRev) ->
+openssh_key_v1_decode(<<?DEC_BIN(Encrypted,_L)>>,
+                      0, Pwd, CipherName, KdfName, KdfOptions, N, PubKeyAccRev) ->
     PubKeys = lists:reverse(PubKeyAccRev),
     try
-        Plain = decrypt_new_openssh(Encrypted, KdfName, KdfOptions, CipherName, Pwd),
-        new_openssh_decode_priv_keys(Plain, N, N, [], [])
+        Plain = decrypt_openssh_key_v1(Encrypted, KdfName, KdfOptions, CipherName, Pwd),
+        openssh_key_v1_decode_priv_keys(Plain, N, N, [], [])
     of
         {PrivKeys, _Comments} ->
             lists:map(fun({ {ed_pub,A,Pub}, {ed_pri,A,Pub,Pri0} }) ->
@@ -775,27 +977,28 @@ new_openssh_decode(<<?DEC_BIN(Encrypted,_L)>>,
                          (Pair) ->
                               Pair
                       end, lists:zip(PubKeys, PrivKeys))
+            %%                      end, lists:zip3(PubKeys, PrivKeys,_ Comments))
     catch
         error:{decryption, DecryptError} ->
             error({decryption, DecryptError})
     end.
 
 
-new_openssh_decode_priv_keys(Bin, I, N, KeyAcc, CmntAcc) when I>0 ->
+openssh_key_v1_decode_priv_keys(Bin, I, N, KeyAcc, CmntAcc) when I>0 ->
     {PrivKey, <<?DEC_BIN(Comment,_Lc),Rest/binary>>} = ssh_message:ssh2_privkey_decode2(Bin),
-    new_openssh_decode_priv_keys(Rest, I-1, N, [PrivKey|KeyAcc], [Comment|CmntAcc]);
-new_openssh_decode_priv_keys(_Padding, 0, _N, PrivKeyAccRev, CommentAccRev) ->
+    openssh_key_v1_decode_priv_keys(Rest, I-1, N, [PrivKey|KeyAcc], [Comment|CmntAcc]);
+openssh_key_v1_decode_priv_keys(_Padding, 0, _N, PrivKeyAccRev, CommentAccRev) ->
     {lists:reverse(PrivKeyAccRev),
      lists:reverse(CommentAccRev)}.
 
 
-decrypt_new_openssh(Encrypted, <<"none">>, <<>>, _CipherName, _Pwd) ->
+decrypt_openssh_key_v1(Encrypted, <<"none">>, <<>>, _CipherName, _Pwd) ->
     check_valid_decryption(Encrypted, ?NON_CRYPT_BLOCKSIZE);
-decrypt_new_openssh(Encrypted, <<>>, <<>>, _CipherName, _Pwd) ->
+decrypt_openssh_key_v1(Encrypted, <<>>, <<>>, _CipherName, _Pwd) ->
     check_valid_decryption(Encrypted, ?NON_CRYPT_BLOCKSIZE);
-decrypt_new_openssh(_Encrypted, <<"bcrypt">>, <<?DEC_BIN(_Salt,_L),?UINT32(_Rounds)>>, _CipherName, _Pwd) ->
+decrypt_openssh_key_v1(_Encrypted, <<"bcrypt">>, <<?DEC_BIN(_Salt,_L),?UINT32(_Rounds)>>, _CipherName, _Pwd) ->
     error({decryption, {not_supported,bcrypt}});
-decrypt_new_openssh(_Encrypted, KdfName, _KdfOpts, _CipherName, _Pwd) ->
+decrypt_openssh_key_v1(_Encrypted, KdfName, _KdfOpts, _CipherName, _Pwd) ->
     error({decryption, {not_supported,KdfName}}).
 
 
@@ -822,5 +1025,62 @@ check_padding(Bin, BlockSize) ->
             true
     end.
 
+%%%----------------------------------------------------------------
+%% KeyPairs :: [ {Pub,Priv,Comment} | {ed_pri{_,_,_},Comment} ]
+openssh_key_v1_encode(KeyPairs) ->
+    CipherName = <<"none">>,
+    BlockSize = ?NON_CRYPT_BLOCKSIZE, % Cipher dependent
+    KdfName = <<"none">>,
+    KdfOptions = <<>>,
+    NumKeys = length(KeyPairs),
+    CheckInt = crypto:strong_rand_bytes(4),
+    UnEncrypted0 = <<CheckInt/binary,
+                     CheckInt/binary,
+                     (openssh_key_v1_encode_priv_keys_cmnts(KeyPairs))/binary>>,
+    UnEncrypted = <<UnEncrypted0/binary,
+                    (pad(size(UnEncrypted0), BlockSize))/binary>>,
+    Encrypted = encrypt_openssh_key_v1(UnEncrypted,  KdfName, KdfOptions, CipherName, ignore),
+    <<"openssh-key-v1",0,
+      ?STRING(CipherName),
+      ?STRING(KdfName),
+      ?STRING(KdfOptions),
+      ?UINT32(NumKeys),
+      (openssh_key_v1_encode_pub_keys(KeyPairs))/binary,
+      ?STRING(Encrypted)>>.
+
+%%%----
+openssh_key_v1_encode_pub_keys(KeyPairs) ->
+    openssh_key_v1_encode_pub_keys(KeyPairs, []).
+
+openssh_key_v1_encode_pub_keys([{{ed_pri,Alg,PubKey,_},_C}|Ks], Acc) ->
+    Bk = ssh_message:ssh2_pubkey_encode({ed_pub,Alg,PubKey}),
+    openssh_key_v1_encode_pub_keys(Ks, [<<?STRING(Bk)>>|Acc]);
+openssh_key_v1_encode_pub_keys([{K,_,_C}|Ks], Acc) ->
+    Bk = ssh_message:ssh2_pubkey_encode(K),
+    openssh_key_v1_encode_pub_keys(Ks, [<<?STRING(Bk)>>|Acc]);
+openssh_key_v1_encode_pub_keys([], Acc) ->
+    list_to_binary(lists:reverse(Acc)).
+
+%%%----
+openssh_key_v1_encode_priv_keys_cmnts(KeyPairs) ->
+    openssh_key_v1_encode_priv_keys_cmnts(KeyPairs, []).
+
+openssh_key_v1_encode_priv_keys_cmnts([{K={ed_pri,_,_,_},C} | Ks], Acc) ->
+    Bk = ssh_message:ssh2_privkey_encode(K),
+    openssh_key_v1_encode_priv_keys_cmnts(Ks, [<<Bk/binary,?STRING(C)>>|Acc]);
+openssh_key_v1_encode_priv_keys_cmnts([{_,K,C}|Ks], Acc) ->
+    Bk = ssh_message:ssh2_privkey_encode(K),
+    openssh_key_v1_encode_priv_keys_cmnts(Ks, [<<Bk/binary,?STRING(C)>>|Acc]);
+openssh_key_v1_encode_priv_keys_cmnts([], Acc) ->
+    list_to_binary(lists:reverse(Acc)).
+
+encrypt_openssh_key_v1(UnEncrypted, <<"none">>, <<>>, _CipherName, _Pwd) ->
+    UnEncrypted;
+encrypt_openssh_key_v1(_UnEncrypted,  KdfName, _KdfOptions, _CipherName, _Pwd) ->
+    error({decryption, {not_supported,KdfName}}).
+
+pad(N, BlockSize) when N>BlockSize -> pad(N rem BlockSize, BlockSize);
+pad(N, BlockSize) -> list_to_binary(lists:seq(1,BlockSize-N)).
+
 %%%================================================================
 %%%
diff --git a/lib/ssh/src/ssh_message.erl b/lib/ssh/src/ssh_message.erl
index fa9176b61f..05991f4ba3 100644
--- a/lib/ssh/src/ssh_message.erl
+++ b/lib/ssh/src/ssh_message.erl
@@ -33,12 +33,14 @@
 -export([encode/1, decode/1, decode_keyboard_interactive_prompts/2]).
 -export([ssh2_pubkey_decode/1,
          ssh2_pubkey_encode/1,
-         ssh2_privkey_decode2/1]).
+         ssh2_privkey_decode2/1,
+         %% experimental:
+         ssh2_privkey_encode/1
+        ]).
 
 -behaviour(ssh_dbg).
 -export([ssh_dbg_trace_points/0, ssh_dbg_flags/1, ssh_dbg_on/1, ssh_dbg_off/1, ssh_dbg_format/2]).
 
-
 ucl(B) ->
     try unicode:characters_to_list(B) of
 	L when is_list(L) -> L;
@@ -578,6 +580,10 @@ ssh2_pubkey_encode({#'ECPoint'{point = Q}, {namedCurve,OID}}) ->
 ssh2_pubkey_encode({ed_pub, ed25519, Key}) ->
     <<?STRING(<<"ssh-ed25519">>), ?Estring(Key)>>;
 ssh2_pubkey_encode({ed_pub, ed448, Key}) ->
+    <<?STRING(<<"ssh-ed448">>), ?Estring(Key)>>;
+ssh2_pubkey_encode({ed_priv, ed25519, Key, _}) ->
+    <<?STRING(<<"ssh-ed25519">>), ?Estring(Key)>>;
+ssh2_pubkey_encode({ed_priv, ed448, Key, _}) ->
     <<?STRING(<<"ssh-ed448">>), ?Estring(Key)>>.
 
 %%%--------
@@ -627,8 +633,62 @@ ssh2_pubkey_decode2(<<?UINT32(9), "ssh-ed448",
 %% dialyser... ssh2_privkey_decode(KeyBlob) ->
 %% dialyser...     {Key,_RestBlob} = ssh2_privkey_decode2(KeyBlob),
 %% dialyser...     Key.
-
 %% See sshkey_private_serialize_opt in sshkey.c
+
+ssh2_privkey_encode(#'RSAPrivateKey'
+                    {version = 'two-prime', % Found this in public_key:generate_key/1 ..
+                     modulus = N,
+                     publicExponent = E,
+                     privateExponent = D,
+                     prime1 = P,
+                     prime2 = Q,
+                     %% exponent1, % D_mod_P_1
+                     %% exponent2, % D_mod_Q_1
+                     coefficient = IQMP
+                    }) ->
+    <<?STRING(<<"ssh-rsa">>),
+      ?Empint(N), % Yes, N and E is reversed relative pubkey format
+      ?Empint(E), % --"--
+      ?Empint(D),
+      ?Empint(IQMP),
+      ?Empint(P),
+      ?Empint(Q)>>;
+
+ssh2_privkey_encode(#'DSAPrivateKey'
+                    {version = 0,
+                     p = P,
+                     q = Q,
+                     g = G,
+                     y = Y,
+                     x = X
+                    }) ->
+    <<?STRING(<<"ssh-dss">>),
+      ?Empint(P),
+      ?Empint(Q),
+      ?Empint(G),
+      ?Empint(Y), % Publ key
+      ?Empint(X)  % Priv key
+    >>;
+
+ssh2_privkey_encode(#'ECPrivateKey'
+                    {version = 1,
+                     parameters = {namedCurve,OID},
+                     privateKey = Priv,
+                     publicKey = Q
+                    }) ->
+    CurveName = public_key:oid2ssh_curvename(OID),
+    <<?STRING(<<"ecdsa-sha2-",CurveName/binary>>),
+      ?STRING(<<"ecdsa-sha2-",CurveName/binary>>), % Yes
+      ?STRING(Q),
+      ?STRING(Priv)>>;
+      
+ssh2_privkey_encode({ed_pri, Alg, Pub, Priv}) ->
+    Name = atom_to_binary(Alg),
+    <<?STRING(<<"ssh-",Name/binary>>),
+      ?STRING(Pub),
+      ?STRING(Priv)>>.
+
+%%%--------
 ssh2_privkey_decode2(<<?UINT32(7), "ssh-rsa",
                        ?DEC_INT(N, _NL), % Yes, N and E is reversed relative pubkey format
                        ?DEC_INT(E, _EL), % --"--
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 74461fb156..0cbafbe3fc 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -914,31 +914,31 @@ accepted_host(Ssh, PeerName, Port, Public, Opts) ->
                                    "~s host key fingerprint is ~s.~n"
                                    "New host ~p~p accept",
                                    [fmt_hostkey(HostKeyAlg),
-                                    public_key:ssh_hostkey_fingerprint(Alg,Public),
+                                    ssh:hostkey_fingerprint(Alg,Public),
                                     PeerName, PortStr]),
             yes == yes_no(Ssh, Prompt);
 
         %% Call-back alternatives: A user provided fun is called for the decision:
         F when is_function(F,2) ->
-            case catch F(PeerName, public_key:ssh_hostkey_fingerprint(Public)) of
+            case catch F(PeerName, ssh:hostkey_fingerprint(Public)) of
                 true -> true;
                 _ -> {error, fingerprint_check_failed}
             end;
 
         F when is_function(F,3) ->
-            case catch F(PeerName, Port, public_key:ssh_hostkey_fingerprint(Public)) of
+            case catch F(PeerName, Port, ssh:hostkey_fingerprint(Public)) of
                 true -> true;
                 _ -> {error, fingerprint_check_failed}
             end;
 
 	{DigestAlg,F} when is_function(F,2) ->
-            case catch F(PeerName, public_key:ssh_hostkey_fingerprint(DigestAlg,Public)) of
+            case catch F(PeerName, ssh:hostkey_fingerprint(DigestAlg,Public)) of
                 true -> true;
                 _ -> {error, {fingerprint_check_failed,DigestAlg}}
             end;
 
 	{DigestAlg,F} when is_function(F,3) ->
-            case catch F(PeerName, Port, public_key:ssh_hostkey_fingerprint(DigestAlg,Public)) of
+            case catch F(PeerName, Port, ssh:hostkey_fingerprint(DigestAlg,Public)) of
                 true -> true;
                 _ -> {error, {fingerprint_check_failed,DigestAlg}}
             end
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index 36d3e16a18..f53f06c458 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -970,13 +970,13 @@ do_hostkey_fingerprint_check(Config, HashAlg) ->
 	true ->
 	    really_do_hostkey_fingerprint_check(Config, HashAlg);
 	false when HashAlg == old ->
-	    {skip,{unsupported_hash,md5}};% Happen to know that public_key:ssh_hostkey_fingerprint/1 uses md5...
+	    {skip,{unsupported_hash,md5}};% Happen to know that ssh:hostkey_fingerprint/1 uses md5...
 	false ->
 	    {skip,{unsupported_hash,HashAlg}}
     end.
 
 supported_hash(old) ->
-    supported_hash(md5); % Happen to know that public_key:ssh_hostkey_fingerprint/1 uses md5...
+    supported_hash(md5); % Happen to know that ssh:hostkey_fingerprint/1 uses md5...
 supported_hash(HashAlg) ->
     Hs = if is_atom(HashAlg) -> [HashAlg];
             is_list(HashAlg) -> HashAlg
@@ -988,11 +988,11 @@ really_do_hostkey_fingerprint_check(Config, HashAlg) ->
     UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
-    %% All host key fingerprints.  Trust that public_key has checked the ssh_hostkey_fingerprint
+    %% All host key fingerprints.  Trust that public_key has checked the hostkey_fingerprint
     %% function since that function is used by the ssh client...
     FPs0 = [case HashAlg of
-	       old -> public_key:ssh_hostkey_fingerprint(Key);
-	       _ -> public_key:ssh_hostkey_fingerprint(HashAlg, Key)
+	       old -> ssh:hostkey_fingerprint(Key);
+	       _ -> ssh:hostkey_fingerprint(HashAlg, Key)
 	   end
 	   || FileCandidate <- begin
 				   {ok,KeyFileCands} = file:list_dir(SysDir),
@@ -1001,7 +1001,7 @@ really_do_hostkey_fingerprint_check(Config, HashAlg) ->
 	      nomatch =/= re:run(FileCandidate, ".*\\.pub", []),
 	      {Key,_Cmnts} <- begin
 				  {ok,Bin} = file:read_file(filename:join(SysDir, FileCandidate)),
-				  try public_key:ssh_decode(Bin, public_key)
+				  try ssh_file:decode(Bin, public_key)
 				  catch
 				      _:_ -> []
 				  end
diff --git a/lib/ssh/test/ssh_pubkey_SUITE.erl b/lib/ssh/test/ssh_pubkey_SUITE.erl
index 885c9914a0..bb2e067323 100644
--- a/lib/ssh/test/ssh_pubkey_SUITE.erl
+++ b/lib/ssh/test/ssh_pubkey_SUITE.erl
@@ -63,10 +63,33 @@
          connect_rsa_sha2_to_ed448/1,
          connect_rsa_sha2_to_rsa_sha2/1,
 
+         ssh_rsa_public_key/1,
+         ssh_dsa_public_key/1,
+         ssh_ecdsa_public_key/1,
+         ssh_rfc4716_rsa_comment/1,
+         ssh_rfc4716_dsa_comment/1,
+         ssh_rfc4716_rsa_subject/1,
+         ssh_list_public_key/1,
+         ssh_known_hosts/1,
+         ssh1_known_hosts/1,
+         ssh_auth_keys/1,
+         ssh1_auth_keys/1,
+         ssh_openssh_public_key_with_comment/1,
+         ssh_openssh_public_key_long_header/1,
+
+         ssh_hostkey_fingerprint_md5_implicit/1,
+         ssh_hostkey_fingerprint_md5/1,
+         ssh_hostkey_fingerprint_sha/1,
+         ssh_hostkey_fingerprint_sha256/1,
+         ssh_hostkey_fingerprint_sha384/1,
+         ssh_hostkey_fingerprint_sha512/1,
+         ssh_hostkey_fingerprint_list/1,
+
          chk_known_hosts/1
         ]).
 
 -include_lib("common_test/include/ct.hrl").
+-include_lib("public_key/include/public_key.hrl").
 -include("ssh_test_lib.hrl").
 
 %%%----------------------------------------------------------------
@@ -81,6 +104,8 @@ all() ->
     [{group, old_format},
      {group, new_format},
      {group, option_space},
+     {group, ssh_hostkey_fingerprint},
+     {group, ssh_public_key_decode_encode},
      chk_known_hosts
     ].
 
@@ -120,9 +145,28 @@ groups() ->
     [{new_format,  [], ?tests_new},
      {old_format,  [], [check_dsa_disabled, check_rsa_sha1_disabled | ?tests_old++[{group,passphrase}] ]},
      {passphrase,  [], ?tests_old},
-     {option_space,[], [{group,new_format}]}
+     {option_space,[], [{group,new_format}]},
+
+     {ssh_hostkey_fingerprint, [],
+      [ssh_hostkey_fingerprint_md5_implicit,
+       ssh_hostkey_fingerprint_md5,
+       ssh_hostkey_fingerprint_sha,
+       ssh_hostkey_fingerprint_sha256,
+       ssh_hostkey_fingerprint_sha384,
+       ssh_hostkey_fingerprint_sha512,
+       ssh_hostkey_fingerprint_list]},
+
+     {ssh_public_key_decode_encode, [],
+      [ssh_rsa_public_key, ssh_dsa_public_key, ssh_ecdsa_public_key,
+       ssh_rfc4716_rsa_comment, ssh_rfc4716_dsa_comment,
+       ssh_rfc4716_rsa_subject,
+       ssh_list_public_key,
+%%       ssh_known_hosts, ssh_auth_keys, ssh1_known_hosts, ssh1_auth_keys,
+       ssh_openssh_public_key_with_comment,
+       ssh_openssh_public_key_long_header]}
     ].
 
+
 %%%----------------------------------------------------------------
 init_per_suite(Config) ->
     ?CHECK_CRYPTO(
@@ -165,6 +209,12 @@ init_per_group(passphrase, Config0) ->
             {skip, "Unsupported hash"}
     end;
 
+init_per_group(ssh_public_key_decode_encode, Config) ->
+    [{pk_data_dir,
+      filename:join([proplists:get_value(data_dir, Config),
+                     "public_key"])
+     } | Config];
+
 init_per_group(_, Config) ->
     Config.
 
@@ -244,6 +294,27 @@ init_per_testcase(check_dsa_disabled, Co
 init_per_testcase(check_rsa_sha1_disabled, Config0) ->
     setup_default_user_system_dir(rsa_sha1, Config0);
 
+init_per_testcase(ssh_hostkey_fingerprint_md5_implicit, Config) ->
+    init_fingerprint_testcase([md5], Config);
+
+init_per_testcase(ssh_hostkey_fingerprint_md5, Config) ->
+    init_fingerprint_testcase([md5], Config);
+
+init_per_testcase(ssh_hostkey_fingerprint_sha, Config) ->
+    init_fingerprint_testcase([sha], Config);
+
+init_per_testcase(ssh_hostkey_fingerprint_sha256, Config) ->
+    init_fingerprint_testcase([sha256], Config);
+
+init_per_testcase(ssh_hostkey_fingerprint_sha384, Config) ->
+    init_fingerprint_testcase([sha384], Config);
+
+init_per_testcase(ssh_hostkey_fingerprint_sha512, Config) ->
+    init_fingerprint_testcase([sha512], Config);
+
+init_per_testcase(ssh_hostkey_fingerprint_list  , Config) ->
+    init_fingerprint_testcase([sha,md5], Config);
+
 init_per_testcase(_, Config) ->
     Config.
 
@@ -251,6 +322,18 @@ init_per_testcase(_, Config) ->
 end_per_testcase(_, Config) ->
     Config.
 
+%%%----
+init_fingerprint_testcase(Algs, Config0) ->
+    Hashs = proplists:get_value(hashs, crypto:supports(), []),
+    case Algs -- Hashs of
+        [] ->
+            Config = lists:keydelete(watchdog, 1, Config0),
+            Dog = ct:timetrap(?TIMEOUT),
+            [{watchdog, Dog} | Config];
+        UnsupportedAlgs ->
+            {skip,{UnsupportedAlgs,not_supported}}
+    end.
+
 %%%----------------------------------------------------------------
 %%% Test Cases ----------------------------------------------------
 %%%----------------------------------------------------------------
@@ -338,7 +421,370 @@ check_dsa_disabled(Config) ->
             
 check_rsa_sha1_disabled(Config) ->
     try_connect_disabled(Config).
-            
+
+
+%%%----------------------------------------------------------------
+
+%% Check of different host keys left to later
+ssh_hostkey_fingerprint_md5_implicit(_Config) ->
+    Expected = "4b:0b:63:de:0f:a7:3a:ab:2c:cc:2d:d1:21:37:1d:3a",
+    Expected = ssh:hostkey_fingerprint(ssh_hostkey(rsa)).
+
+%%--------------------------------------------------------------------
+%% Check of different host keys left to later
+ssh_hostkey_fingerprint_md5(_Config) ->
+    Expected = "MD5:4b:0b:63:de:0f:a7:3a:ab:2c:cc:2d:d1:21:37:1d:3a",
+    Expected = ssh:hostkey_fingerprint(md5, ssh_hostkey(rsa)).
+
+%%--------------------------------------------------------------------
+%% Since this kind of fingerprint is not available yet on standard
+%% distros, we do like this instead. The Expected is generated with:
+%%       $ openssh-7.3p1/ssh-keygen -E sha1 -lf <file>
+%%       2048 SHA1:Soammnaqg06jrm2jivMSnzQGlmk none@example.org (RSA)
+ssh_hostkey_fingerprint_sha(_Config) ->
+    Expected = "SHA1:Soammnaqg06jrm2jivMSnzQGlmk",
+    Expected = ssh:hostkey_fingerprint(sha, ssh_hostkey(rsa)).
+
+%%--------------------------------------------------------------------
+%% Since this kind of fingerprint is not available yet on standard
+%% distros, we do like this instead.
+ssh_hostkey_fingerprint_sha256(_Config) ->
+    Expected = "SHA256:T7F1BahkJWR7iJO8+rpzWOPbp7LZP4MlNrDExdNYOvY",
+    Expected = ssh:hostkey_fingerprint(sha256, ssh_hostkey(rsa)).
+
+%%--------------------------------------------------------------------
+%% Since this kind of fingerprint is not available yet on standard
+%% distros, we do like this instead.
+ssh_hostkey_fingerprint_sha384(_Config) ->
+    Expected = "SHA384:QhkLoGNI4KXdPvC//HxxSCP3uTQVADqxdajbgm+Gkx9zqz8N94HyP1JmH8C4/aEl",
+    Expected = ssh:hostkey_fingerprint(sha384, ssh_hostkey(rsa)).
+
+%%--------------------------------------------------------------------
+%% Since this kind of fingerprint is not available yet on standard
+%% distros, we do like this instead.
+ssh_hostkey_fingerprint_sha512(_Config) ->
+    Expected = "SHA512:ezUismvm3ADQQb6Nm0c1DwQ6ydInlJNfsnSQejFkXNmABg1Aenk9oi45CXeBOoTnlfTsGG8nFDm0smP10PBEeA",
+    Expected = ssh:hostkey_fingerprint(sha512, ssh_hostkey(rsa)).
+
+%%--------------------------------------------------------------------
+%% Since this kind of fingerprint is not available yet on standard
+%% distros, we do like this instead.
+ssh_hostkey_fingerprint_list(_Config) ->
+    Expected = ["SHA1:Soammnaqg06jrm2jivMSnzQGlmk",
+                "MD5:4b:0b:63:de:0f:a7:3a:ab:2c:cc:2d:d1:21:37:1d:3a"],
+    Expected = ssh:hostkey_fingerprint([sha,md5], ssh_hostkey(rsa)).
+
+%%--------------------------------------------------------------------
+ssh_rsa_public_key(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+    {ok, RSARawSsh2} = file:read_file(filename:join(Datadir, "ssh2_rsa_pub")),
+    [{PubKey, Attributes1}] = ssh_file:decode(RSARawSsh2, public_key),
+    [{PubKey, Attributes1}] = ssh_file:decode(RSARawSsh2, rfc4716_public_key),
+
+    {ok, RSARawOpenSsh} = file:read_file(filename:join(Datadir, "openssh_rsa_pub")),
+    [{PubKey, Attributes2}] = ssh_file:decode(RSARawOpenSsh, public_key),
+    [{PubKey, Attributes2}] = ssh_file:decode(RSARawOpenSsh, openssh_public_key),
+
+    %% Can not check EncodedSSh == RSARawSsh2 and EncodedOpenSsh
+    %% = RSARawOpenSsh as line breakpoints may differ
+
+    EncodedSSh = ssh_file:encode([{PubKey, Attributes1}], rfc4716_public_key),
+    EncodedOpenSsh = ssh_file:encode([{PubKey, Attributes2}], openssh_public_key),
+
+    [{PubKey, Attributes1}] =
+	ssh_file:decode(EncodedSSh, public_key),
+    [{PubKey, Attributes2}] =
+	ssh_file:decode(EncodedOpenSsh, public_key).
+
+%%--------------------------------------------------------------------
+ssh_dsa_public_key(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+
+    {ok, DSARawSsh2} = file:read_file(filename:join(Datadir, "ssh2_dsa_pub")),
+    [{PubKey, Attributes1}] = ssh_file:decode(DSARawSsh2, public_key),
+    [{PubKey, Attributes1}] = ssh_file:decode(DSARawSsh2, rfc4716_public_key),
+
+    {ok, DSARawOpenSsh} = file:read_file(filename:join(Datadir, "openssh_dsa_pub")),
+    [{PubKey, Attributes2}] = ssh_file:decode(DSARawOpenSsh, public_key),
+    [{PubKey, Attributes2}] = ssh_file:decode(DSARawOpenSsh, openssh_public_key),
+
+    %% Can not check EncodedSSh == DSARawSsh2 and EncodedOpenSsh
+    %% = DSARawOpenSsh as line breakpoints may differ
+
+    EncodedSSh = ssh_file:encode([{PubKey, Attributes1}], rfc4716_public_key),
+    EncodedOpenSsh = ssh_file:encode([{PubKey, Attributes2}], openssh_public_key),
+
+    [{PubKey, Attributes1}] =
+	ssh_file:decode(EncodedSSh, public_key),
+    [{PubKey, Attributes2}] =
+	ssh_file:decode(EncodedOpenSsh, public_key).
+
+%%--------------------------------------------------------------------
+ssh_ecdsa_public_key(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+
+    {ok, ECDSARawSsh2} = file:read_file(filename:join(Datadir, "ssh2_ecdsa_pub")),
+    [{PubKey, Attributes1}] = ssh_file:decode(ECDSARawSsh2, public_key),
+    [{PubKey, Attributes1}] = ssh_file:decode(ECDSARawSsh2, rfc4716_public_key),
+
+    {ok, ECDSARawOpenSsh} = file:read_file(filename:join(Datadir, "openssh_ecdsa_pub")),
+    [{PubKey, Attributes2}] = ssh_file:decode(ECDSARawOpenSsh, public_key),
+    [{PubKey, Attributes2}] =ssh_file:decode(ECDSARawOpenSsh, openssh_public_key),
+
+    %% Can not check EncodedSSh == ECDSARawSsh2 and EncodedOpenSsh
+    %% = ECDSARawOpenSsh as line breakpoints may differ
+
+    EncodedSSh = ssh_file:encode([{PubKey, Attributes1}], rfc4716_public_key),
+    EncodedOpenSsh = ssh_file:encode([{PubKey, Attributes2}], openssh_public_key),
+
+    [{PubKey, Attributes1}] =
+	ssh_file:decode(EncodedSSh, public_key),
+    [{PubKey, Attributes2}] =
+	ssh_file:decode(EncodedOpenSsh, public_key).
+
+%%--------------------------------------------------------------------
+ssh_list_public_key(Config) when is_list(Config) ->
+    DataDir = proplists:get_value(pk_data_dir, Config),
+    {Data_ssh2, Expect_ssh2} =
+        collect_binaries_expected(DataDir, rfc4716_public_key,
+                                  ["ssh2_rsa_pub", "ssh2_rsa_comment_pub",
+                                   "ssh2_dsa_pub", "ssh2_dsa_comment_pub",
+                                   "ssh2_ecdsa_pub", 
+                                   "ssh2_subject_pub"]),
+    {Data_openssh, Expect_openssh} =
+        collect_binaries_expected(DataDir, openssh_public_key,
+                                  ["openssh_rsa_pub", "openssh_dsa_pub", "openssh_ecdsa_pub"]),
+
+    true =
+        (chk_decode(Data_openssh,   Expect_openssh, openssh_public_key) and
+         chk_decode(Data_ssh2,      Expect_ssh2,    rfc4716_public_key) and
+         chk_decode(Data_openssh,   Expect_openssh, public_key)         and
+         chk_decode(Data_ssh2,      Expect_ssh2,    public_key)         and
+         chk_encode(Expect_openssh, openssh_public_key) and
+         chk_encode(Expect_ssh2,    rfc4716_public_key)
+        ).
+
+chk_encode(Data, Type) ->
+    case ssh_file:decode(ssh_file:encode(Data,Type), Type) of
+        Data->
+            ct:pal("re-encode ~p ok", [Type]),
+            true;
+        Result ->
+            ct:pal("re-encode ~p FAILED~n"
+                   "Got~n ~p~nExpect~n ~p~n",
+                   [Type, Result, Data]),
+            false
+    end.
+
+
+chk_decode(Data, Expect, Type) ->
+    case ssh_file:decode(Data, Type) of
+        Expect ->
+            ct:pal("decode ~p ok", [Type]),
+            true;
+        BadResult ->
+            ct:pal("decode ~p FAILED~n"
+                   "Result~n ~p~nExpect~n ~p~n"
+                   "~p",
+                   [Type, BadResult, Expect,
+                    if
+                        is_list(BadResult) ->
+                            lists:foldr(fun({Key,Attrs}, Acc) ->
+                                                case Key of
+                                                    #'RSAPublicKey'{} when is_list(Attrs) -> Acc;
+                                                    {_, #'Dss-Parms'{}} when is_list(Attrs) -> Acc;
+                                                    {#'ECPoint'{}, {namedCurve,_}} when is_list(Attrs) -> Acc;
+                                                    _  when is_list(Attrs) -> [{bad_key,{Key,Attrs}}|Acc];
+                                                    _ -> [{bad_attrs,{Key,Attrs}}|Acc]
+                                                end;
+                                           (Other,Acc) ->
+                                                [{other,Other}|Acc]
+                                        end, [], BadResult);
+                        true ->
+                            '???'
+                    end]),
+            false
+    end.
+
+
+collect_binaries_expected(Dir, Type, Files) ->
+    Bins0 = [B || F <- Files,
+                  {ok,B} <- [ file:read_file(filename:join(Dir,F)) ]
+            ],
+    {list_to_binary( lists:join("\n", Bins0)),
+     lists:flatten([ssh_file:decode(B,Type) || B <- Bins0])}.
+
+%%--------------------------------------------------------------------
+ssh_rfc4716_rsa_comment(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+
+    {ok, RSARawSsh2} = file:read_file(filename:join(Datadir, "ssh2_rsa_comment_pub")),
+    [{#'RSAPublicKey'{} = PubKey, Attributes}] =
+        ssh_file:decode(RSARawSsh2, public_key),
+
+    Headers = proplists:get_value(headers, Attributes),
+
+    Value = proplists:get_value("Comment", Headers, undefined),
+    true = Value =/= undefined,
+    RSARawSsh2 = ssh_file:encode([{PubKey, Attributes}], rfc4716_public_key).
+
+%%--------------------------------------------------------------------
+ssh_rfc4716_dsa_comment(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+
+    {ok, DSARawSsh2} = file:read_file(filename:join(Datadir, "ssh2_dsa_comment_pub")),
+    [{{_, #'Dss-Parms'{}} = PubKey, Attributes}] =
+        ssh_file:decode(DSARawSsh2, public_key),
+
+    Headers = proplists:get_value(headers, Attributes),
+
+    Value = proplists:get_value("Comment", Headers, undefined),
+    true = Value =/= undefined,
+
+    %% Can not check Encoded == DSARawSsh2 as line continuation breakpoints may differ
+    Encoded  = ssh_file:encode([{PubKey, Attributes}], rfc4716_public_key),
+    [{PubKey, Attributes}] =
+        ssh_file:decode(Encoded, public_key).
+
+%%--------------------------------------------------------------------
+ssh_rfc4716_rsa_subject(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+
+    {ok, RSARawSsh2} = file:read_file(filename:join(Datadir, "ssh2_subject_pub")),
+    [{#'RSAPublicKey'{} = PubKey, Attributes}] =
+        ssh_file:decode(RSARawSsh2, public_key),
+
+    Headers = proplists:get_value(headers, Attributes),
+
+    Value = proplists:get_value("Subject", Headers, undefined),
+    true = Value =/= undefined,
+
+    %% Can not check Encoded == RSARawSsh2 as line continuation breakpoints may differ
+    Encoded  = ssh_file:encode([{PubKey, Attributes}], rfc4716_public_key),
+    [{PubKey, Attributes}] =
+        ssh_file:decode(Encoded, public_key).
+
+%%--------------------------------------------------------------------
+ssh_known_hosts(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+
+    {ok, SshKnownHosts} = file:read_file(filename:join(Datadir, "known_hosts")),
+    [{#'RSAPublicKey'{}, Attributes1}, {#'RSAPublicKey'{}, Attributes2},
+     {#'RSAPublicKey'{}, Attributes3}, {#'RSAPublicKey'{}, Attributes4}] = Decoded =
+        ssh_file:decode(SshKnownHosts, known_hosts),
+
+    Comment1 = undefined,
+    Comment2 = "foo@bar.com",
+    Comment3 = "Comment with whitespaces",
+    Comment4 = "foo@bar.com Comment with whitespaces",
+    	
+    Comment1 = proplists:get_value(comment, Attributes1, undefined),
+    Comment2 = proplists:get_value(comment, Attributes2),
+    Comment3 = proplists:get_value(comment, Attributes3),
+    Comment4 = proplists:get_value(comment, Attributes4),	
+
+    Value1 = proplists:get_value(hostnames, Attributes1, undefined),
+    Value2 = proplists:get_value(hostnames, Attributes2, undefined),
+    true = (Value1 =/= undefined) and (Value2 =/= undefined),
+
+    Encoded = ssh_file:encode(Decoded, known_hosts),
+    Decoded = ssh_file:decode(Encoded, known_hosts).
+
+%%--------------------------------------------------------------------
+ssh1_known_hosts(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+
+    {ok, SshKnownHosts} = file:read_file(filename:join(Datadir, "ssh1_known_hosts")),
+    [{#'RSAPublicKey'{}, Attributes1}, {#'RSAPublicKey'{}, Attributes2},{#'RSAPublicKey'{}, Attributes3}] 
+	= Decoded = ssh_file:decode(SshKnownHosts, known_hosts),
+
+    Value1 = proplists:get_value(hostnames, Attributes1, undefined),
+    Value2 = proplists:get_value(hostnames, Attributes2, undefined),
+    true = (Value1 =/= undefined) and (Value2 =/= undefined),
+
+    Comment ="dhopson@VMUbuntu-DSH comment with whitespaces",
+    Comment = proplists:get_value(comment, Attributes3),
+
+    Encoded = ssh_file:encode(Decoded, known_hosts),
+    Decoded = ssh_file:decode(Encoded, known_hosts).
+
+%%--------------------------------------------------------------------
+ssh_auth_keys(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+
+    {ok, SshAuthKeys} = file:read_file(filename:join(Datadir, "auth_keys")),
+    [{#'RSAPublicKey'{}, Attributes1}, {{_, #'Dss-Parms'{}}, Attributes2},
+     {#'RSAPublicKey'{}, Attributes3}, {{_, #'Dss-Parms'{}}, Attributes4}
+    ] = Decoded =
+        ssh_file:decode(SshAuthKeys, auth_keys),
+
+    Value1 = proplists:get_value(options, Attributes1, undefined),
+    true = Value1 =/= undefined,
+
+    Comment1 = Comment2 = "dhopson@VMUbuntu-DSH",
+    Comment3 = Comment4 ="dhopson@VMUbuntu-DSH comment with whitespaces",
+    
+    Comment1 = proplists:get_value(comment, Attributes1),
+    Comment2 = proplists:get_value(comment, Attributes2),
+    Comment3 = proplists:get_value(comment, Attributes3),
+    Comment4 = proplists:get_value(comment, Attributes4),
+
+    Encoded = ssh_file:encode(Decoded, auth_keys),
+    Decoded = ssh_file:decode(Encoded, auth_keys).
+
+%%--------------------------------------------------------------------
+ssh1_auth_keys(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+
+    {ok, SshAuthKeys} = file:read_file(filename:join(Datadir, "ssh1_auth_keys")),
+    [{#'RSAPublicKey'{}, Attributes1},
+     {#'RSAPublicKey'{}, Attributes2}, {#'RSAPublicKey'{}, Attributes3},
+     {#'RSAPublicKey'{}, Attributes4}, {#'RSAPublicKey'{}, Attributes5}] = Decoded =
+        ssh_file:decode(SshAuthKeys, auth_keys),
+
+    Value1 = proplists:get_value(bits, Attributes2, undefined),
+    Value2 = proplists:get_value(bits, Attributes3, undefined),
+    true = (Value1 =/= undefined) and (Value2 =/= undefined),
+
+    Comment2 = Comment3 = "dhopson@VMUbuntu-DSH",
+    Comment4 = Comment5 ="dhopson@VMUbuntu-DSH comment with whitespaces",
+    
+    undefined = proplists:get_value(comment, Attributes1, undefined),
+    Comment2 = proplists:get_value(comment, Attributes2),
+    Comment3 = proplists:get_value(comment, Attributes3),
+    Comment4 = proplists:get_value(comment, Attributes4),
+    Comment5 = proplists:get_value(comment, Attributes5),
+
+    Encoded = ssh_file:encode(Decoded, auth_keys),
+    Decoded = ssh_file:decode(Encoded, auth_keys).
+
+%%--------------------------------------------------------------------
+ssh_openssh_public_key_with_comment(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+
+    {ok, DSARawOpenSsh} = file:read_file(filename:join(Datadir, "openssh_dsa_with_comment_pub")),
+    [{{_, #'Dss-Parms'{}}, _}] = ssh_file:decode(DSARawOpenSsh, openssh_public_key).
+
+%%--------------------------------------------------------------------
+ssh_openssh_public_key_long_header(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(pk_data_dir, Config),
+
+    {ok,RSARawOpenSsh} = file:read_file(filename:join(Datadir, "ssh_rsa_long_header_pub")),
+    [{#'RSAPublicKey'{}, _}] = Decoded = ssh_file:decode(RSARawOpenSsh, public_key),
+
+    Encoded = ssh_file:encode(Decoded, rfc4716_public_key),
+    Decoded = ssh_file:decode(Encoded, rfc4716_public_key).
+
+%%%----------------------------------------------------------------
+%%% Test case helpers
+%%%----------------------------------------------------------------
+%% Should use stored keys instead
+ssh_hostkey(rsa) ->
+    [{PKdecoded,_}] =
+	ssh_file:decode(
+	  <<"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYXcYmsyJBstl4EfFYzfQJmSiUE162zvSGSoMYybShYOI6rnnyvvihfw8Aml+2gZ716F2tqG48FQ/yPZEGWNPMrCejPpJctaPWhpNdNMJ8KFXSEgr5bY2mEpa19DHmuDeXKzeJJ+X7s3fVdYc4FMk5731KIW6Huf019ZnTxbx0VKG6b1KAJBg3vpNsDxEMwQ4LFMB0JHVklOTzbxmpaeULuIxvl65A+eGeFVeo2Q+YI9UnwY1vSgmc9Azwy8Ie9Z0HpQBN5I7Uc5xnknT8V6xDhgNfXEfzsgsRdDfZLECt1WO/1gP9wkosvAGZWt5oG8pbNQWiQdFq536ck8WQD9WD none@example.org">>,
+	  public_key),
+    PKdecoded.
 
 %%%----------------------------------------------------------------
 chk_known_hosts(Config) ->
@@ -392,7 +838,6 @@ chk_known_hosts(Config) ->
 try_connect({skip,Reason}) ->
     {skip,Reason};
 try_connect(Config) ->
-%ssh_dbg:start(fun ct:pal/2), dbg:tp(ssh_transport,sign,3,x), dbg:tp(ssh_transport,verify,5,x),
     SystemDir = proplists:get_value(system_dir, Config),
     UserDir = proplists:get_value(user_dir, Config),
     ClientOpts = proplists:get_value(client_opts, Config, []),
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/auth_keys b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/auth_keys
new file mode 100644
index 0000000000..8be7357a06
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/auth_keys
@@ -0,0 +1,7 @@
+command="dump /home",no-pty,no-port-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAwrr66r8n6B8Y0zMF3dOpXEapIQD9DiYQ6D6/zwor9o39jSkHNiMMER/GETBbzP83LOcekm02aRjo55ArO7gPPVvCXbrirJu9pkm4AC4BBre5xSLS7soyzwbigFruM8G63jSXqpHqJ/ooi168sKMC2b0Ncsi+JlTfNYlDXJVLKEeZgZOInQyMmtisaDTUQWTIv1snAizf4iIYENuAkGYGNCL77u5Y5VOu5eQipvFajTnps9QvUx/zdSFYn9e2sulWM3Bxc/S4IJ67JWHVRpfJxGi3hinRBH8WQdXuUwdJJTiJHKPyYrrM7Q6Xq4TOMFtcRuLDC6u3BXM1L0gBvHPNOnD5l2Lp5EjUkQ9CBf2j4A4gfH+iWQZyk08esAG/iwArAVxkl368+dkbMWOXL8BN4x5zYgdzoeypQZZ2RKH780MCTSo4WQ19DP8pw+9q3bSFC9H3xYAxrKAJNWjeTUJOTrTe+mWXXU770gYyQTxa2ycnYrlZucn1S3vsvn6eq7NZZ8NRbyv1n15Ocg+nHK4fuKOrwPhU3NbKQwtjb0Wsxx1gAmQqIOLTpAdsrAauPxC7TPYA5qQVCphvimKuhQM/1gMV225JrnjspVlthCzuFYUjXOKC3wxz6FFEtwnXu3uC5bVVkmkNadJmD21gD23yk4BraGXVYpRMIB+X+OTUUI8= dhopson@VMUbuntu-DSH
+
+ssh-dss AAAAB3NzaC1kc3MAAACBAPY8ZOHY2yFSJA6XYC9HRwNHxaehvx5wOJ0rzZdzoSOXxbETW6ToHv8D1UJ/z+zHo9Fiko5XybZnDIaBDHtblQ+Yp7StxyltHnXF1YLfKD1G4T6JYrdHYI14Om1eg9e4NnCRleaqoZPF3UGfZia6bXrGTQf3gJq2e7Yisk/gF+1VAAAAFQDb8D5cvwHWTZDPfX0D2s9Rd7NBvQAAAIEAlN92+Bb7D4KLYk3IwRbXblwXdkPggA4pfdtW9vGfJ0/RHd+NjB4eo1D+0dix6tXwYGN7PKS5R/FXPNwxHPapcj9uL1Jn2AWQ2dsknf+i/FAAvioUPkmdMc0zuWoSOEsSNhVDtX3WdvVcGcBq9cetzrtOKWOocJmJ80qadxTRHtUAAACBAN7CY+KKv1gHpRzFwdQm7HK9bb1LAo2KwaoXnadFgeptNBQeSXG1vO+JsvphVMBJc9HSn24VYtYtsMu74qXviYjziVucWKjjKEb11juqnF0GDlB3VVmxHLmxnAz643WK42Z7dLM5sY29ouezv4Xz2PuMch5VGPP+CDqzCM4loWgV dhopson@VMUbuntu-DSH
+
+command="dump /home",no-pty,no-port-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAwrr66r8n6B8Y0zMF3dOpXEapIQD9DiYQ6D6/zwor9o39jSkHNiMMER/GETBbzP83LOcekm02aRjo55ArO7gPPVvCXbrirJu9pkm4AC4BBre5xSLS7soyzwbigFruM8G63jSXqpHqJ/ooi168sKMC2b0Ncsi+JlTfNYlDXJVLKEeZgZOInQyMmtisaDTUQWTIv1snAizf4iIYENuAkGYGNCL77u5Y5VOu5eQipvFajTnps9QvUx/zdSFYn9e2sulWM3Bxc/S4IJ67JWHVRpfJxGi3hinRBH8WQdXuUwdJJTiJHKPyYrrM7Q6Xq4TOMFtcRuLDC6u3BXM1L0gBvHPNOnD5l2Lp5EjUkQ9CBf2j4A4gfH+iWQZyk08esAG/iwArAVxkl368+dkbMWOXL8BN4x5zYgdzoeypQZZ2RKH780MCTSo4WQ19DP8pw+9q3bSFC9H3xYAxrKAJNWjeTUJOTrTe+mWXXU770gYyQTxa2ycnYrlZucn1S3vsvn6eq7NZZ8NRbyv1n15Ocg+nHK4fuKOrwPhU3NbKQwtjb0Wsxx1gAmQqIOLTpAdsrAauPxC7TPYA5qQVCphvimKuhQM/1gMV225JrnjspVlthCzuFYUjXOKC3wxz6FFEtwnXu3uC5bVVkmkNadJmD21gD23yk4BraGXVYpRMIB+X+OTUUI8= dhopson@VMUbuntu-DSH comment with whitespaces
+
+ssh-dss AAAAB3NzaC1kc3MAAACBAPY8ZOHY2yFSJA6XYC9HRwNHxaehvx5wOJ0rzZdzoSOXxbETW6ToHv8D1UJ/z+zHo9Fiko5XybZnDIaBDHtblQ+Yp7StxyltHnXF1YLfKD1G4T6JYrdHYI14Om1eg9e4NnCRleaqoZPF3UGfZia6bXrGTQf3gJq2e7Yisk/gF+1VAAAAFQDb8D5cvwHWTZDPfX0D2s9Rd7NBvQAAAIEAlN92+Bb7D4KLYk3IwRbXblwXdkPggA4pfdtW9vGfJ0/RHd+NjB4eo1D+0dix6tXwYGN7PKS5R/FXPNwxHPapcj9uL1Jn2AWQ2dsknf+i/FAAvioUPkmdMc0zuWoSOEsSNhVDtX3WdvVcGcBq9cetzrtOKWOocJmJ80qadxTRHtUAAACBAN7CY+KKv1gHpRzFwdQm7HK9bb1LAo2KwaoXnadFgeptNBQeSXG1vO+JsvphVMBJc9HSn24VYtYtsMu74qXviYjziVucWKjjKEb11juqnF0GDlB3VVmxHLmxnAz643WK42Z7dLM5sY29ouezv4Xz2PuMch5VGPP+CDqzCM4loWgV dhopson@VMUbuntu-DSH comment with whitespaces
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/known_hosts b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/known_hosts
new file mode 100644
index 0000000000..3c3af68178
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/known_hosts
@@ -0,0 +1,8 @@
+hostname.domain.com,192.168.0.1 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1XY18+zA8VNK2YkzygOkMqUxHSTfxT1Xxx8CgDZgcQH8HUhPssW5ttvG8nKetlPQZAVk1C4WkWS1y5b3ekBhZTIxocp9Joc6V1+f2EOfO2mSLRwB16RGrdw6q7msrBXTC/dl+hF45kMMzVNzqxnSMVOa0sEPK2zK6Sg3Vi9fCSM=
+
+|1|BWO5qDxk/cFH0wa05JLdHn+j6xQ=|rXQvIxh5cDD3C43k5DPDamawVNA= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1XY18+zA8VNK2YkzygOkMqUxHSTfxT1Xxx8CgDZgcQH8HUhPssW5ttvG8nKetlPQZAVk1C4WkWS1y5b3ekBhZTIxocp9Joc6V1+f2EOfO2mSLRwB16RGrdw6q7msrBXTC/dl+hF45kMMzVNzqxnSMVOa0sEPK2zK6Sg3Vi9fCSM= foo@bar.com
+
+hostname.domain.com,192.168.0.1 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1XY18+zA8VNK2YkzygOkMqUxHSTfxT1Xxx8CgDZgcQH8HUhPssW5ttvG8nKetlPQZAVk1C4WkWS1y5b3ekBhZTIxocp9Joc6V1+f2EOfO2mSLRwB16RGrdw6q7msrBXTC/dl+hF45kMMzVNzqxnSMVOa0sEPK2zK6Sg3Vi9fCSM= Comment with whitespaces
+
+|1|BWO5qDxk/cFH0wa05JLdHn+j6xQ=|rXQvIxh5cDD3C43k5DPDamawVNA= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA1XY18+zA8VNK2YkzygOkMqUxHSTfxT1Xxx8CgDZgcQH8HUhPssW5ttvG8nKetlPQZAVk1C4WkWS1y5b3ekBhZTIxocp9Joc6V1+f2EOfO2mSLRwB16RGrdw6q7msrBXTC/dl+hF45kMMzVNzqxnSMVOa0sEPK2zK6Sg3Vi9fCSM= foo@bar.com Comment with whitespaces
+
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_dsa_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_dsa_pub
new file mode 100644
index 0000000000..a765ba8189
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_dsa_pub
@@ -0,0 +1 @@
+ssh-dss AAAAB3NzaC1kc3MAAACBAPY8ZOHY2yFSJA6XYC9HRwNHxaehvx5wOJ0rzZdzoSOXxbETW6ToHv8D1UJ/z+zHo9Fiko5XybZnDIaBDHtblQ+Yp7StxyltHnXF1YLfKD1G4T6JYrdHYI14Om1eg9e4NnCRleaqoZPF3UGfZia6bXrGTQf3gJq2e7Yisk/gF+1VAAAAFQDb8D5cvwHWTZDPfX0D2s9Rd7NBvQAAAIEAlN92+Bb7D4KLYk3IwRbXblwXdkPggA4pfdtW9vGfJ0/RHd+NjB4eo1D+0dix6tXwYGN7PKS5R/FXPNwxHPapcj9uL1Jn2AWQ2dsknf+i/FAAvioUPkmdMc0zuWoSOEsSNhVDtX3WdvVcGcBq9cetzrtOKWOocJmJ80qadxTRHtUAAACBAN7CY+KKv1gHpRzFwdQm7HK9bb1LAo2KwaoXnadFgeptNBQeSXG1vO+JsvphVMBJc9HSn24VYtYtsMu74qXviYjziVucWKjjKEb11juqnF0GDlB3VVmxHLmxnAz643WK42Z7dLM5sY29ouezv4Xz2PuMch5VGPP+CDqzCM4loWgV dhopson@VMUbuntu-DSH
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_dsa_with_comment_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_dsa_with_comment_pub
new file mode 100644
index 0000000000..d5a34a3f78
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_dsa_with_comment_pub
@@ -0,0 +1,3 @@
+#This should be ignored!!
+
+ssh-dss AAAAB3NzaC1kc3MAAACBAPY8ZOHY2yFSJA6XYC9HRwNHxaehvx5wOJ0rzZdzoSOXxbETW6ToHv8D1UJ/z+zHo9Fiko5XybZnDIaBDHtblQ+Yp7StxyltHnXF1YLfKD1G4T6JYrdHYI14Om1eg9e4NnCRleaqoZPF3UGfZia6bXrGTQf3gJq2e7Yisk/gF+1VAAAAFQDb8D5cvwHWTZDPfX0D2s9Rd7NBvQAAAIEAlN92+Bb7D4KLYk3IwRbXblwXdkPggA4pfdtW9vGfJ0/RHd+NjB4eo1D+0dix6tXwYGN7PKS5R/FXPNwxHPapcj9uL1Jn2AWQ2dsknf+i/FAAvioUPkmdMc0zuWoSOEsSNhVDtX3WdvVcGcBq9cetzrtOKWOocJmJ80qadxTRHtUAAACBAN7CY+KKv1gHpRzFwdQm7HK9bb1LAo2KwaoXnadFgeptNBQeSXG1vO+JsvphVMBJc9HSn24VYtYtsMu74qXviYjziVucWKjjKEb11juqnF0GDlB3VVmxHLmxnAz643WK42Z7dLM5sY29ouezv4Xz2PuMch5VGPP+CDqzCM4loWgV dhopson@VMUbuntu-DSH
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_ecdsa_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_ecdsa_pub
new file mode 100644
index 0000000000..a49b4264b8
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_ecdsa_pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIJrVlKYIT+MlxxRx5BFXisHHkcGMAAKv2dguUeOsutsYyzs9JAczvl6c+Sypra5+qOi2LHPXw6GGluuXcOssOM= uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_rsa_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_rsa_pub
new file mode 100644
index 0000000000..0a0838db40
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/openssh_rsa_pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAwrr66r8n6B8Y0zMF3dOpXEapIQD9DiYQ6D6/zwor9o39jSkHNiMMER/GETBbzP83LOcekm02aRjo55ArO7gPPVvCXbrirJu9pkm4AC4BBre5xSLS7soyzwbigFruM8G63jSXqpHqJ/ooi168sKMC2b0Ncsi+JlTfNYlDXJVLKEeZgZOInQyMmtisaDTUQWTIv1snAizf4iIYENuAkGYGNCL77u5Y5VOu5eQipvFajTnps9QvUx/zdSFYn9e2sulWM3Bxc/S4IJ67JWHVRpfJxGi3hinRBH8WQdXuUwdJJTiJHKPyYrrM7Q6Xq4TOMFtcRuLDC6u3BXM1L0gBvHPNOnD5l2Lp5EjUkQ9CBf2j4A4gfH+iWQZyk08esAG/iwArAVxkl368+dkbMWOXL8BN4x5zYgdzoeypQZZ2RKH780MCTSo4WQ19DP8pw+9q3bSFC9H3xYAxrKAJNWjeTUJOTrTe+mWXXU770gYyQTxa2ycnYrlZucn1S3vsvn6eq7NZZ8NRbyv1n15Ocg+nHK4fuKOrwPhU3NbKQwtjb0Wsxx1gAmQqIOLTpAdsrAauPxC7TPYA5qQVCphvimKuhQM/1gMV225JrnjspVlthCzuFYUjXOKC3wxz6FFEtwnXu3uC5bVVkmkNadJmD21gD23yk4BraGXVYpRMIB+X+OTUUI8= dhopson@VMUbuntu-DSH
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh1_auth_keys b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh1_auth_keys
new file mode 100644
index 0000000000..ac3d61b4c7
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh1_auth_keys
@@ -0,0 +1,9 @@
+1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663
+
+1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH
+
+command="dump /home",no-pty,no-port-forwarding 1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH
+
+1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH comment with whitespaces
+
+command="dump /home",no-pty,no-port-forwarding 1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH comment with whitespaces
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh1_known_hosts b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh1_known_hosts
new file mode 100644
index 0000000000..835b16ab67
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh1_known_hosts
@@ -0,0 +1,3 @@
+hostname.domain.com,192.168.0.1 1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH
+hostname2.domain.com,192.168.0.2 1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663
+hostname3.domain.com,192.168.0.3 1024 35 794430685278501116412873221867658581245241426828503388129294124540165981586596106773643485704743298698207838825035605868404742682423919455523383721081589378970796492944950066480951790660582889972423189943567111507801410254720228911513553205592856585541922662924268445466959576882300405064708497308004255650466014242855505233634626075778108365396568863197935915425650388910408127232583533503834009244199384570662092164277923946411149853110048365318587554141774139652307149492021035538341281427025252592933784473453522113124752189378715431529801894015739903371171585194505182320772654217490509848165365152457990491089951560694728469571221819385402117009544812199223715540348068497710535492913376699508575875577554607325905000745578091554027803374110357015655416894607641289462159580964951182385869168785183135763253784745647466464331174922663455073627501620274348748413309761116542324505123795743603781806636788810617169341018091186028310551725315297135354426735951943325476221811539822892501042385411792050504283745898099390893596941969752683246939665141002098430129617772928840718016009187577151479855846883928332010147501182201528575840364152774917950524127063432334646746291719251739989499132767590205934821590545762802261107691663 dhopson@VMUbuntu-DSH comment with whitespaces
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_dsa_comment_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_dsa_comment_pub
new file mode 100644
index 0000000000..ca5089dbd7
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_dsa_comment_pub
@@ -0,0 +1,13 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+Comment: This is my public key for use on \
+servers which I don't like.
+AAAAB3NzaC1kc3MAAACBAPY8ZOHY2yFSJA6XYC9HRwNHxaehvx5wOJ0rzZdzoSOXxbET
+W6ToHv8D1UJ/z+zHo9Fiko5XybZnDIaBDHtblQ+Yp7StxyltHnXF1YLfKD1G4T6JYrdH
+YI14Om1eg9e4NnCRleaqoZPF3UGfZia6bXrGTQf3gJq2e7Yisk/gF+1VAAAAFQDb8D5c
+vwHWTZDPfX0D2s9Rd7NBvQAAAIEAlN92+Bb7D4KLYk3IwRbXblwXdkPggA4pfdtW9vGf
+J0/RHd+NjB4eo1D+0dix6tXwYGN7PKS5R/FXPNwxHPapcj9uL1Jn2AWQ2dsknf+i/FAA
+vioUPkmdMc0zuWoSOEsSNhVDtX3WdvVcGcBq9cetzrtOKWOocJmJ80qadxTRHtUAAACB
+AN7CY+KKv1gHpRzFwdQm7HK9bb1LAo2KwaoXnadFgeptNBQeSXG1vO+JsvphVMBJc9HS
+n24VYtYtsMu74qXviYjziVucWKjjKEb11juqnF0GDlB3VVmxHLmxnAz643WK42Z7dLM5
+sY29ouezv4Xz2PuMch5VGPP+CDqzCM4loWgV
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_dsa_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_dsa_pub
new file mode 100644
index 0000000000..a5e38be81a
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_dsa_pub
@@ -0,0 +1,12 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+Comment: DSA Public Key for use with MyIsp
+AAAAB3NzaC1kc3MAAACBAPY8ZOHY2yFSJA6XYC9HRwNHxaehvx5wOJ0rzZdzoSOXxbET
+W6ToHv8D1UJ/z+zHo9Fiko5XybZnDIaBDHtblQ+Yp7StxyltHnXF1YLfKD1G4T6JYrdH
+YI14Om1eg9e4NnCRleaqoZPF3UGfZia6bXrGTQf3gJq2e7Yisk/gF+1VAAAAFQDb8D5c
+vwHWTZDPfX0D2s9Rd7NBvQAAAIEAlN92+Bb7D4KLYk3IwRbXblwXdkPggA4pfdtW9vGf
+J0/RHd+NjB4eo1D+0dix6tXwYGN7PKS5R/FXPNwxHPapcj9uL1Jn2AWQ2dsknf+i/FAA
+vioUPkmdMc0zuWoSOEsSNhVDtX3WdvVcGcBq9cetzrtOKWOocJmJ80qadxTRHtUAAACB
+AN7CY+KKv1gHpRzFwdQm7HK9bb1LAo2KwaoXnadFgeptNBQeSXG1vO+JsvphVMBJc9HS
+n24VYtYtsMu74qXviYjziVucWKjjKEb11juqnF0GDlB3VVmxHLmxnAz643WK42Z7dLM5
+sY29ouezv4Xz2PuMch5VGPP+CDqzCM4loWgV
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_ecdsa_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_ecdsa_pub
new file mode 100644
index 0000000000..702e5c4fde
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_ecdsa_pub
@@ -0,0 +1,6 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+Comment: "256-bit ECDSA, converted by uabhnil@elxadlj3q32 from OpenSSH"
+AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIJrVlKYIT+MlxxRx5
+BFXisHHkcGMAAKv2dguUeOsutsYyzs9JAczvl6c+Sypra5+qOi2LHPXw6GGluuXcOssOM=
+
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_rsa_comment_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_rsa_comment_pub
new file mode 100644
index 0000000000..e4d446147c
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_rsa_comment_pub
@@ -0,0 +1,7 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+Comment: "1024-bit RSA, converted from OpenSSH by me@example.com"
+x-command: /home/me/bin/lock-in-guest.sh
+AAAAB3NzaC1yc2EAAAABIwAAAIEA1on8gxCGJJWSRT4uOrR13mUaUk0hRf4RzxSZ1zRb
+YYFw8pfGesIFoEuVth4HKyF8k1y4mRUnYHP1XNMNMJl1JcEArC2asV8sHf6zSPVffozZ
+5TT4SfsUu/iKy9lUcCfXzwre4WWZSXXcPff+EHtWshahu3WzBdnGxm5Xoi89zcE=
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_rsa_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_rsa_pub
new file mode 100644
index 0000000000..761088b517
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_rsa_pub
@@ -0,0 +1,13 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+AAAAB3NzaC1yc2EAAAABIwAAAgEAwrr66r8n6B8Y0zMF3dOpXEapIQD9DiYQ6D6/zwor9o
+39jSkHNiMMER/GETBbzP83LOcekm02aRjo55ArO7gPPVvCXbrirJu9pkm4AC4BBre5xSLS
+7soyzwbigFruM8G63jSXqpHqJ/ooi168sKMC2b0Ncsi+JlTfNYlDXJVLKEeZgZOInQyMmt
+isaDTUQWTIv1snAizf4iIYENuAkGYGNCL77u5Y5VOu5eQipvFajTnps9QvUx/zdSFYn9e2
+sulWM3Bxc/S4IJ67JWHVRpfJxGi3hinRBH8WQdXuUwdJJTiJHKPyYrrM7Q6Xq4TOMFtcRu
+LDC6u3BXM1L0gBvHPNOnD5l2Lp5EjUkQ9CBf2j4A4gfH+iWQZyk08esAG/iwArAVxkl368
++dkbMWOXL8BN4x5zYgdzoeypQZZ2RKH780MCTSo4WQ19DP8pw+9q3bSFC9H3xYAxrKAJNW
+jeTUJOTrTe+mWXXU770gYyQTxa2ycnYrlZucn1S3vsvn6eq7NZZ8NRbyv1n15Ocg+nHK4f
+uKOrwPhU3NbKQwtjb0Wsxx1gAmQqIOLTpAdsrAauPxC7TPYA5qQVCphvimKuhQM/1gMV22
+5JrnjspVlthCzuFYUjXOKC3wxz6FFEtwnXu3uC5bVVkmkNadJmD21gD23yk4BraGXVYpRM
+IB+X+OTUUI8=
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_subject_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_subject_pub
new file mode 100644
index 0000000000..8b8ccda8ba
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh2_subject_pub
@@ -0,0 +1,8 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+Subject: me
+Comment: 1024-bit rsa, created by me@example.com Mon Jan 15 \
+08:31:24 2001
+AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
+596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
+soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh_rsa_long_comment_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh_rsa_long_comment_pub
new file mode 100644
index 0000000000..7b42ced93e
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh_rsa_long_comment_pub
@@ -0,0 +1,9 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+Comment: This is an example of a very very very very looooooooooooo\
+ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong\
+commment
+x-command: /home/me/bin/lock-in-guest.sh
+AAAAB3NzaC1yc2EAAAABIwAAAIEA1on8gxCGJJWSRT4uOrR13mUaUk0hRf4RzxSZ1zRb
+YYFw8pfGesIFoEuVth4HKyF8k1y4mRUnYHP1XNMNMJl1JcEArC2asV8sHf6zSPVffozZ
+5TT4SfsUu/iKy9lUcCfXzwre4WWZSXXcPff+EHtWshahu3WzBdnGxm5Xoi89zcE=
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh_rsa_long_header_pub b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh_rsa_long_header_pub
new file mode 100644
index 0000000000..7b42ced93e
--- /dev/null
+++ b/lib/ssh/test/ssh_pubkey_SUITE_data/public_key/ssh_rsa_long_header_pub
@@ -0,0 +1,9 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+Comment: This is an example of a very very very very looooooooooooo\
+ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong\
+commment
+x-command: /home/me/bin/lock-in-guest.sh
+AAAAB3NzaC1yc2EAAAABIwAAAIEA1on8gxCGJJWSRT4uOrR13mUaUk0hRf4RzxSZ1zRb
+YYFw8pfGesIFoEuVth4HKyF8k1y4mRUnYHP1XNMNMJl1JcEArC2asV8sHf6zSPVffozZ
+5TT4SfsUu/iKy9lUcCfXzwre4WWZSXXcPff+EHtWshahu3WzBdnGxm5Xoi89zcE=
+---- END SSH2 PUBLIC KEY ----
-- 
2.26.2

Places

File 3901-ssh-Add-fingerprint-and-ssh_encode-ssh_decode-functi.patch of Package erlang (Revision 8cb5d5fde1cca12e0e8bdc4c50dbf291)

Places