1 files changed, 3 insertions, 1 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index 5bf11c085..f10f6bf8c 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1418,6 +1418,8 @@ pubkey_prepare(Authctxt *authctxt)
 
         /* list of keys stored in the filesystem */
         for (i = 0; i < options.num_identity_files; i++) {
+                if (options.identity_files[i] == NULL)
+                        continue;
                 key = options.identity_keys[i];
                 if (key && key->type == KEY_RSA1)
                         continue;
@@ -1510,7 +1512,7 @@ userauth_pubkey(Authctxt *authctxt)
                 if (id->key && id->key->type != KEY_RSA1) {
                         debug("Offering public key: %s", id->filename);
                         sent = send_pubkey_test(authctxt, id);
-                } else if (id->key == NULL) {
+                } else if (id->key == NULL && id->filename) {
                         debug("Trying private key: %s", id->filename);
                         id->key = load_identity_file(id->filename);
                         if (id->key != NULL) {