Import of OpenSSH 3.3p1

[gssapi-openssh.git] / openssh / sshconnect1.c

diff --git a/openssh/sshconnect1.c b/openssh/sshconnect1.c
index d2024a2b7061ebf059a19fe9549daabd34a4c1f7..e28b7fc72160264b72adaf364f3c42e9ce0e7955 100644 (file)
--- a/openssh/sshconnect1.c
+++ b/openssh/sshconnect1.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.50 2002/04/21 16:25:06 stevesk Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.51 2002/05/23 19:24:30 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/md5.h>
@@ -1138,7 +1138,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
  */
 void
 ssh_userauth1(const char *local_user, const char *server_user, char *host,
-    Key **keys, int nkeys)
+    Sensitive *sensitive)
 {
 #ifdef KRB5
        krb5_context context = NULL;
@@ -1224,9 +1224,11 @@ 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] != NULL && keys[i]->type == KEY_RSA1 &&
-                           try_rhosts_rsa_authentication(local_user, keys[i]))
+               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]))
                                goto success;
                }
        }