diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-17 18:08:15 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-17 18:08:15 +0000 |
| commit | 9cb59afb9027f5449f2fc4e8d78cd62ca350355e (patch) | |
| tree | 725d8d053f419e8bbc2c87823696da3fc30b1cfb | |
| parent | 459d1913bfd4a444d8a778bc819f026d2dc10ec0 (diff) | |
- markus@cvs.openbsd.org 2001/04/17 08:14:01
[sshconnect1.c]
check for key!=NULL, thanks to costa
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sshconnect1.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -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 @@ -5131,4 +5134,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1131 2001/04/17 18:06:14 mouring Exp $ +$Id: ChangeLog,v 1.1132 2001/04/17 18:08:15 mouring Exp $ diff --git a/sshconnect1.c b/sshconnect1.c index 865d04e8..d4267667 100644 --- 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; } |