1 files changed, 13 insertions, 6 deletions
diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl
index 4498c70d34..33792da38f 100644
--- a/lib/ssh/src/ssh_file.erl
+++ b/lib/ssh/src/ssh_file.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -75,10 +75,7 @@ host_key(Algorithm, Opts) ->
     Password = proplists:get_value(identity_pass_phrase(Algorithm), Opts, ignore),
     case decode(File, Password) of
 	{ok,Key} ->
-	    case ssh_transport:valid_key_sha_alg(Key,Algorithm) of
-                true -> {ok,Key};
-                false -> {error,bad_keytype_in_file}
-	    end;
+            check_key_type(Key, Algorithm);
 	{error,DecodeError} ->
             {error,DecodeError}
     end.
@@ -104,10 +101,20 @@ is_host_key(Key, PeerName, Algorithm, Opts) ->
 user_key(Algorithm, Opts) ->
     File = file_name(user, identity_key_filename(Algorithm), Opts),
     Password = proplists:get_value(identity_pass_phrase(Algorithm), Opts, ignore),
-    decode(File, Password).
+    case decode(File, Password) of
+        {ok, Key} ->
+            check_key_type(Key, Algorithm);
+        Error ->
+            Error
+    end.
 
 
 %% Internal functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+check_key_type(Key, Algorithm) ->
+    case ssh_transport:valid_key_sha_alg(Key,Algorithm) of
+        true -> {ok,Key};
+        false -> {error,bad_keytype_in_file}
+    end.
 
 file_base_name('ssh-rsa'            ) -> "ssh_host_rsa_key";
 file_base_name('rsa-sha2-256'       ) -> "ssh_host_rsa_key";