- markus@cvs.openbsd.org 2001/04/17 08:14:01

     [sshconnect1.c]
     check for key!=NULL, thanks to costa

diff --git a/ChangeLog b/ChangeLog
index a06e3c9cc48f2cd806b7db495f781514c7fbc301..14114134e26264efe8ffca6392d6a8e708ac239a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
    - deraadt@cvs.openbsd.org 2001/04/16 08:26:04                         
      [key.c]                                                             
      better safe than sorry in later mods; yongari@kt-is.co.kr   
+   - markus@cvs.openbsd.org 2001/04/17 08:14:01                          
+     [sshconnect1.c]                                                     
+     check for key!=NULL, thanks to costa  
 
 20010416
   - OpenBSD CVS Sync

diff --git a/sshconnect1.c b/sshconnect1.c
index 865d04e85056bfec826ac04b6830abc3811c1d4a..d42676676bfdf5dd333e77d1d60cde9132f1ed74 100644 (file)
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.30 2001/04/12 19:15:25 markus Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.31 2001/04/17 08:14:01 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
@@ -999,7 +999,7 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host,
        if ((supported_authentications & (1 << SSH_AUTH_RHOSTS_RSA)) &&
            options.rhosts_rsa_authentication) {
                for (i = 0; i < nkeys; i++) {
-                       if (keys[i]->type == KEY_RSA1 &&
+                       if (keys[i] != NULL && keys[i]->type == KEY_RSA1 &&
                            try_rhosts_rsa_authentication(local_user, keys[i]))
                                return;
                }