diff options
Diffstat (limited to 'sshconnect1.c')
-rw-r--r-- | sshconnect1.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sshconnect1.c b/sshconnect1.c index d2024a2b7..e28b7fc72 100644 --- a/sshconnect1.c +++ b/sshconnect1.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect1.c,v 1.50 2002/04/21 16:25:06 stevesk Exp $"); | 16 | RCSID("$OpenBSD: sshconnect1.c,v 1.51 2002/05/23 19:24:30 markus Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | #include <openssl/md5.h> | 19 | #include <openssl/md5.h> |
@@ -1138,7 +1138,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr) | |||
1138 | */ | 1138 | */ |
1139 | void | 1139 | void |
1140 | ssh_userauth1(const char *local_user, const char *server_user, char *host, | 1140 | ssh_userauth1(const char *local_user, const char *server_user, char *host, |
1141 | Key **keys, int nkeys) | 1141 | Sensitive *sensitive) |
1142 | { | 1142 | { |
1143 | #ifdef KRB5 | 1143 | #ifdef KRB5 |
1144 | krb5_context context = NULL; | 1144 | krb5_context context = NULL; |
@@ -1224,9 +1224,11 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host, | |||
1224 | */ | 1224 | */ |
1225 | if ((supported_authentications & (1 << SSH_AUTH_RHOSTS_RSA)) && | 1225 | if ((supported_authentications & (1 << SSH_AUTH_RHOSTS_RSA)) && |
1226 | options.rhosts_rsa_authentication) { | 1226 | options.rhosts_rsa_authentication) { |
1227 | for (i = 0; i < nkeys; i++) { | 1227 | for (i = 0; i < sensitive->nkeys; i++) { |
1228 | if (keys[i] != NULL && keys[i]->type == KEY_RSA1 && | 1228 | if (sensitive->keys[i] != NULL && |
1229 | try_rhosts_rsa_authentication(local_user, keys[i])) | 1229 | sensitive->keys[i]->type == KEY_RSA1 && |
1230 | try_rhosts_rsa_authentication(local_user, | ||
1231 | sensitive->keys[i])) | ||
1230 | goto success; | 1232 | goto success; |
1231 | } | 1233 | } |
1232 | } | 1234 | } |