diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
commit | 46c162204b5a6f7471525c2f75cb2c607c88b83f (patch) | |
tree | 9041b006ab612c18bdb16b606601839a00ca5b2c /auth1.c | |
parent | a074feb65d6f1fcad02e80b751e2287fd6230b09 (diff) |
One way to massive patch. <sigh> It compiles and works under Linux..
And I think I have all the bits right from the OpenBSD tree.
20001222
- Updated RCSID for pty.c
- (bal) OpenBSD CVS Updates:
- markus@cvs.openbsd.org 2000/12/21 15:10:16
[auth-rh-rsa.c hostfile.c hostfile.h sshconnect.c]
print keyfile:line for changed hostkeys, for deraadt@, ok deraadt@
- markus@cvs.openbsd.org 2000/12/20 19:26:56
[authfile.c]
allow ssh -i userkey for root
- markus@cvs.openbsd.org 2000/12/20 19:37:21
[authfd.c authfd.h kex.c sshconnect2.c sshd.c uidswap.c uidswap.h]
fix prototypes; from stevesk@pobox.com
- markus@cvs.openbsd.org 2000/12/20 19:32:08
[sshd.c]
init pointer to NULL; report from Jan.Ivan@cern.ch
- markus@cvs.openbsd.org 2000/12/19 23:17:54
[auth-krb4.c auth-options.c auth-options.h auth-rhosts.c auth-rsa.c
auth1.c auth2-skey.c auth2.c authfd.c authfd.h authfile.c bufaux.c
bufaux.h buffer.c canohost.c channels.c clientloop.c compress.c
crc32.c deattack.c getput.h hmac.c hmac.h hostfile.c kex.c kex.h
key.c key.h log.c login.c match.c match.h mpaux.c mpaux.h packet.c
packet.h radix.c readconf.c rsa.c scp.c servconf.c servconf.h
serverloop.c session.c sftp-server.c ssh-agent.c ssh-dss.c ssh-dss.h
ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh-rsa.h ssh.c ssh.h uuencode.c
uuencode.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c]
replace 'unsigned bla' with 'u_bla' everywhere. also replace 'char
unsigned' with u_char.
Diffstat (limited to 'auth1.c')
-rw-r--r-- | auth1.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.7 2000/11/10 01:04:40 markus Exp $"); | 13 | RCSID("$OpenBSD: auth1.c,v 1.8 2000/12/19 23:17:55 markus Exp $"); |
14 | 14 | ||
15 | #ifdef HAVE_OSF_SIA | 15 | #ifdef HAVE_OSF_SIA |
16 | # include <sia.h> | 16 | # include <sia.h> |
@@ -81,14 +81,14 @@ do_authloop(struct passwd * pw, char *luser) | |||
81 | { | 81 | { |
82 | int authenticated = 0; | 82 | int authenticated = 0; |
83 | int attempt = 0; | 83 | int attempt = 0; |
84 | unsigned int bits; | 84 | u_int bits; |
85 | RSA *client_host_key; | 85 | RSA *client_host_key; |
86 | BIGNUM *n; | 86 | BIGNUM *n; |
87 | char *client_user, *password; | 87 | char *client_user, *password; |
88 | char user[1024]; | 88 | char user[1024]; |
89 | unsigned int dlen; | 89 | u_int dlen; |
90 | int plen, nlen, elen; | 90 | int plen, nlen, elen; |
91 | unsigned int ulen; | 91 | u_int ulen; |
92 | int type = 0; | 92 | int type = 0; |
93 | void (*authlog) (const char *fmt,...) = verbose; | 93 | void (*authlog) (const char *fmt,...) = verbose; |
94 | 94 | ||
@@ -149,7 +149,7 @@ do_authloop(struct passwd * pw, char *luser) | |||
149 | /* Try Kerberos v4 authentication. */ | 149 | /* Try Kerberos v4 authentication. */ |
150 | KTEXT_ST auth; | 150 | KTEXT_ST auth; |
151 | char *tkt_user = NULL; | 151 | char *tkt_user = NULL; |
152 | char *kdata = packet_get_string((unsigned int *) &auth.length); | 152 | char *kdata = packet_get_string((u_int *) &auth.length); |
153 | packet_integrity_check(plen, 4 + auth.length, type); | 153 | packet_integrity_check(plen, 4 + auth.length, type); |
154 | 154 | ||
155 | if (auth.length < MAX_KTXT_LEN) | 155 | if (auth.length < MAX_KTXT_LEN) |
@@ -394,7 +394,7 @@ do_authentication() | |||
394 | { | 394 | { |
395 | struct passwd *pw, pwcopy; | 395 | struct passwd *pw, pwcopy; |
396 | int plen; | 396 | int plen; |
397 | unsigned int ulen; | 397 | u_int ulen; |
398 | char *user; | 398 | char *user; |
399 | 399 | ||
400 | /* Get the name of the user that we wish to log in as. */ | 400 | /* Get the name of the user that we wish to log in as. */ |