===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/sshconnect1.c,v
retrieving revision 1.49.2.4
retrieving revision 1.50
diff -u -r1.49.2.4 -r1.50
--- src/usr.bin/ssh/Attic/sshconnect1.c	2002/10/11 14:51:53	1.49.2.4
+++ src/usr.bin/ssh/Attic/sshconnect1.c	2002/04/21 16:25:06	1.50
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.49.2.4 2002/10/11 14:51:53 miod Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.50 2002/04/21 16:25:06 stevesk Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/md5.h>
@@ -251,7 +251,7 @@
 	 * load the private key.  Try first with empty passphrase; if it
 	 * fails, ask for a passphrase.
 	 */
-	if (public->flags & KEY_FLAG_EXT)
+	if (public->flags && KEY_FLAG_EXT)
 		private = public;
 	else
 		private = key_load_private_type(KEY_RSA1, authfile, "", NULL);
@@ -1092,7 +1092,7 @@
  */
 void
 ssh_userauth1(const char *local_user, const char *server_user, char *host,
-    Sensitive *sensitive)
+    Key **keys, int nkeys)
 {
 #ifdef KRB5
 	krb5_context context = NULL;
@@ -1178,11 +1178,9 @@
 	 */
 	if ((supported_authentications & (1 << SSH_AUTH_RHOSTS_RSA)) &&
 	    options.rhosts_rsa_authentication) {
-		for (i = 0; i < sensitive->nkeys; i++) {
-			if (sensitive->keys[i] != NULL &&
-			    sensitive->keys[i]->type == KEY_RSA1 &&
-			    try_rhosts_rsa_authentication(local_user,
-			    sensitive->keys[i]))
+		for (i = 0; i < nkeys; i++) {
+			if (keys[i] != NULL && keys[i]->type == KEY_RSA1 &&
+			    try_rhosts_rsa_authentication(local_user, keys[i]))
 				goto success;
 		}
 	}