diff options
| author | Damien Miller <djm@mindrot.org> | 2000-04-16 11:18:38 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-04-16 11:18:38 +1000 |
| commit | 4af51306d9a51459a5bef922df1037f876ae51fe (patch) | |
| tree | 09ecfc215fce82345a3259f8a0f384b9a67906f0 /auth-skey.c | |
| parent | 5d1705ecf9bd3216dc99a84242bcdf2e7297d307 (diff) | |
- OpenBSD CVS updates.
[ssh.1 ssh.c]
- ssh -2
[auth.c channels.c clientloop.c packet.c packet.h serverloop.c]
[session.c sshconnect.c]
- check payload for (illegal) extra data
[ALL]
- whitespace cleanup
Diffstat (limited to 'auth-skey.c')
| -rw-r--r-- | auth-skey.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/auth-skey.c b/auth-skey.c index f403a196..056efeb9 100644 --- a/auth-skey.c +++ b/auth-skey.c @@ -1,7 +1,7 @@ #include "includes.h" #ifdef SKEY -RCSID("$Id: auth-skey.c,v 1.5 1999/12/06 19:04:57 deraadt Exp $"); +RCSID("$Id: auth-skey.c,v 1.6 2000/04/14 10:30:29 markus Exp $"); #include "ssh.h" #include "packet.h" @@ -15,12 +15,12 @@ RCSID("$Id: auth-skey.c,v 1.5 1999/12/06 19:04:57 deraadt Exp $"); /* from %OpenBSD: skeylogin.c,v 1.32 1999/08/16 14:46:56 millert Exp % */ -/* +/* * try skey authentication, - * return 1 on success, 0 on failure, -1 if skey is not available + * return 1 on success, 0 on failure, -1 if skey is not available */ -int +int auth_skey_password(struct passwd * pw, const char *password) { if (strncasecmp(password, "s/key", 5) == 0) { @@ -53,18 +53,18 @@ auth_skey_password(struct passwd * pw, const char *password) */ static u_int32_t hash_collapse(s) - u_char *s; + u_char *s; { - int len, target; + int len, target; u_int32_t i; if ((strlen(s) % sizeof(u_int32_t)) == 0) - target = strlen(s); /* Multiple of 4 */ + target = strlen(s); /* Multiple of 4 */ else target = strlen(s) - (strlen(s) % sizeof(u_int32_t)); - + for (i = 0, len = 0; len < target; len += 4) - i ^= ROUND(s + len); + i ^= ROUND(s + len); return i; } |