Merge remote branch 'upstream/maint'

* upstream/maint:
  ssh: Increase robustness
  inets: Dialyzer spec fixes

2 files changed, 11 insertions, 2 deletions

diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 6967a0f464..d08dbafc32 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -24,6 +24,7 @@
 	      {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
 	      {load_module, ssh_auth, soft_purge, soft_purge, []},
 	      {load_module, ssh_channel, soft_purge, soft_purge, []},
+	      {load_module, ssh_file, soft_purge, soft_purge, []}]},
 	      {load_module, ssh, soft_purge, soft_purge, []}]},
   {<<"2.0\\.*">>, [{restart_application, ssh}]},
   {<<"1\\.*">>, [{restart_application, ssh}]}
@@ -34,6 +35,7 @@
 	      {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
 	      {load_module, ssh_auth, soft_purge, soft_purge, []},
 	      {load_module, ssh_channel, soft_purge, soft_purge, []},
+	      {load_module, ssh_file, soft_purge, soft_purge, []}]},
 	      {load_module, ssh, soft_purge, soft_purge, []}]},
   {<<"2.0\\.*">>, [{restart_application, ssh}]},
   {<<"1\\.*">>, [{restart_application, ssh}]}
diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl
index d05fa8e09a..a6b82a7a13 100644
--- a/lib/ssh/src/ssh_file.erl
+++ b/lib/ssh/src/ssh_file.erl
@@ -232,7 +232,7 @@ lookup_host_key_fd(Fd, Host, KeyType) ->
 	eof ->
 	    {error, not_found};
 	Line ->
-	    case public_key:ssh_decode(Line, known_hosts) of
+	    case ssh_decode_line(Line, known_hosts) of
 		[{Key, Attributes}] ->
 		    handle_host(Fd, Host, proplists:get_value(hostnames, Attributes), Key, KeyType);
 		[] ->
@@ -240,6 +240,13 @@ lookup_host_key_fd(Fd, Host, KeyType) ->
 	    end
     end.
 
+ssh_decode_line(Line, Type) ->
+    try 
+	public_key:ssh_decode(Line, Type) 
+    catch _:_ ->
+	    []
+    end.
+
 handle_host(Fd, Host, HostList, Key, KeyType) ->
     Host1 = host_name(Host),
     case lists:member(Host1, HostList) and key_match(Key, KeyType) of
@@ -285,7 +292,7 @@ lookup_user_key_fd(Fd, Key) ->
 	eof ->
 	    {error, not_found};
 	Line ->
-	    case public_key:ssh_decode(Line, auth_keys) of
+	    case ssh_decode_line(Line, auth_keys) of
 		[{AuthKey, _}] ->
 		    case is_auth_key(Key, AuthKey) of
 			true ->