summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshconnect1.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d00ebef7c..ea589346c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 - deraadt@cvs.openbsd.org 2001/04/16 08:26:04 6 - deraadt@cvs.openbsd.org 2001/04/16 08:26:04
7 [key.c] 7 [key.c]
8 better safe than sorry in later mods; yongari@kt-is.co.kr 8 better safe than sorry in later mods; yongari@kt-is.co.kr
9 - markus@cvs.openbsd.org 2001/04/17 08:14:01
10 [sshconnect1.c]
11 check for key!=NULL, thanks to costa
9 12
1020010416 1320010416
11 - OpenBSD CVS Sync 14 - OpenBSD CVS Sync
@@ -5131,4 +5134,4 @@
5131 - Wrote replacements for strlcpy and mkdtemp 5134 - Wrote replacements for strlcpy and mkdtemp
5132 - Released 1.0pre1 5135 - Released 1.0pre1
5133 5136
5134$Id: ChangeLog,v 1.1131 2001/04/17 18:06:14 mouring Exp $ 5137$Id: ChangeLog,v 1.1132 2001/04/17 18:08:15 mouring Exp $
diff --git a/sshconnect1.c b/sshconnect1.c
index 865d04e85..d42676676 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect1.c,v 1.30 2001/04/12 19:15:25 markus Exp $"); 16RCSID("$OpenBSD: sshconnect1.c,v 1.31 2001/04/17 08:14:01 markus Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19#include <openssl/evp.h> 19#include <openssl/evp.h>
@@ -999,7 +999,7 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host,
999 if ((supported_authentications & (1 << SSH_AUTH_RHOSTS_RSA)) && 999 if ((supported_authentications & (1 << SSH_AUTH_RHOSTS_RSA)) &&
1000 options.rhosts_rsa_authentication) { 1000 options.rhosts_rsa_authentication) {
1001 for (i = 0; i < nkeys; i++) { 1001 for (i = 0; i < nkeys; i++) {
1002 if (keys[i]->type == KEY_RSA1 && 1002 if (keys[i] != NULL && keys[i]->type == KEY_RSA1 &&
1003 try_rhosts_rsa_authentication(local_user, keys[i])) 1003 try_rhosts_rsa_authentication(local_user, keys[i]))
1004 return; 1004 return;
1005 } 1005 }