diff options
author | Damien Miller <djm@mindrot.org> | 2002-01-22 23:11:40 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-01-22 23:11:40 +1100 |
commit | 48b03fc5460390318e94462707182b72dfaba91f (patch) | |
tree | 5fca9bcb09bab53083b274e0121a92dc8c1fbb16 /auth1.c | |
parent | 66823cddbe80d1d22ac44d503b8c121f071e7105 (diff) |
- markus@cvs.openbsd.org 2001/12/27 20:39:58
[auth1.c auth-rsa.c channels.c clientloop.c packet.c packet.h serverloop.c session.c ssh.c sshconnect1.c sshd.c ttymodes.c]
get rid of packet_integrity_check, use packet_done() instead.
Diffstat (limited to 'auth1.c')
-rw-r--r-- | auth1.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.31 2001/12/27 20:39:58 markus Exp $"); | 13 | RCSID("$OpenBSD: auth1.c,v 1.32 2001/12/28 12:14:27 markus Exp $"); |
14 | 14 | ||
15 | #include "xmalloc.h" | 15 | #include "xmalloc.h" |
16 | #include "rsa.h" | 16 | #include "rsa.h" |
@@ -120,7 +120,7 @@ do_authloop(Authctxt *authctxt) | |||
120 | verbose("Kerberos authentication disabled."); | 120 | verbose("Kerberos authentication disabled."); |
121 | } else { | 121 | } else { |
122 | char *kdata = packet_get_string(&dlen); | 122 | char *kdata = packet_get_string(&dlen); |
123 | packet_done(); | 123 | packet_check_eom(); |
124 | 124 | ||
125 | if (kdata[0] == 4) { /* KRB_PROT_VERSION */ | 125 | if (kdata[0] == 4) { /* KRB_PROT_VERSION */ |
126 | #ifdef KRB4 | 126 | #ifdef KRB4 |
@@ -180,7 +180,7 @@ do_authloop(Authctxt *authctxt) | |||
180 | * IP-spoofing on a local network.) | 180 | * IP-spoofing on a local network.) |
181 | */ | 181 | */ |
182 | client_user = packet_get_string(&ulen); | 182 | client_user = packet_get_string(&ulen); |
183 | packet_done(); | 183 | packet_check_eom(); |
184 | 184 | ||
185 | /* Try to authenticate using /etc/hosts.equiv and .rhosts. */ | 185 | /* Try to authenticate using /etc/hosts.equiv and .rhosts. */ |
186 | authenticated = auth_rhosts(pw, client_user); | 186 | authenticated = auth_rhosts(pw, client_user); |
@@ -210,7 +210,7 @@ do_authloop(Authctxt *authctxt) | |||
210 | verbose("Warning: keysize mismatch for client_host_key: " | 210 | verbose("Warning: keysize mismatch for client_host_key: " |
211 | "actual %d, announced %d", | 211 | "actual %d, announced %d", |
212 | BN_num_bits(client_host_key->rsa->n), bits); | 212 | BN_num_bits(client_host_key->rsa->n), bits); |
213 | packet_done(); | 213 | packet_check_eom(); |
214 | 214 | ||
215 | authenticated = auth_rhosts_rsa(pw, client_user, | 215 | authenticated = auth_rhosts_rsa(pw, client_user, |
216 | client_host_key); | 216 | client_host_key); |
@@ -228,7 +228,7 @@ do_authloop(Authctxt *authctxt) | |||
228 | if ((n = BN_new()) == NULL) | 228 | if ((n = BN_new()) == NULL) |
229 | fatal("do_authloop: BN_new failed"); | 229 | fatal("do_authloop: BN_new failed"); |
230 | packet_get_bignum(n, &nlen); | 230 | packet_get_bignum(n, &nlen); |
231 | packet_done(); | 231 | packet_check_eom(); |
232 | authenticated = auth_rsa(pw, n); | 232 | authenticated = auth_rsa(pw, n); |
233 | BN_clear_free(n); | 233 | BN_clear_free(n); |
234 | break; | 234 | break; |
@@ -244,7 +244,7 @@ do_authloop(Authctxt *authctxt) | |||
244 | * not visible to an outside observer. | 244 | * not visible to an outside observer. |
245 | */ | 245 | */ |
246 | password = packet_get_string(&dlen); | 246 | password = packet_get_string(&dlen); |
247 | packet_done(); | 247 | packet_check_eom(); |
248 | 248 | ||
249 | #ifdef USE_PAM | 249 | #ifdef USE_PAM |
250 | /* Do PAM auth with password */ | 250 | /* Do PAM auth with password */ |
@@ -282,7 +282,7 @@ do_authloop(Authctxt *authctxt) | |||
282 | if (options.challenge_response_authentication == 1) { | 282 | if (options.challenge_response_authentication == 1) { |
283 | char *response = packet_get_string(&dlen); | 283 | char *response = packet_get_string(&dlen); |
284 | debug("got response '%s'", response); | 284 | debug("got response '%s'", response); |
285 | packet_done(); | 285 | packet_check_eom(); |
286 | authenticated = verify_response(authctxt, response); | 286 | authenticated = verify_response(authctxt, response); |
287 | memset(response, 'r', dlen); | 287 | memset(response, 'r', dlen); |
288 | xfree(response); | 288 | xfree(response); |
@@ -369,7 +369,7 @@ do_authentication(void) | |||
369 | 369 | ||
370 | /* Get the user name. */ | 370 | /* Get the user name. */ |
371 | user = packet_get_string(&ulen); | 371 | user = packet_get_string(&ulen); |
372 | packet_done(); | 372 | packet_check_eom(); |
373 | 373 | ||
374 | if ((style = strchr(user, ':')) != NULL) | 374 | if ((style = strchr(user, ':')) != NULL) |
375 | *style++ = '\0'; | 375 | *style++ = '\0'; |