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 /authfd.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 'authfd.c')
-rw-r--r-- | authfd.c | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: authfd.c,v 1.30 2000/11/12 19:50:37 markus Exp $"); | 38 | RCSID("$OpenBSD: authfd.c,v 1.32 2000/12/20 19:37:21 markus Exp $"); |
39 | 39 | ||
40 | #include "ssh.h" | 40 | #include "ssh.h" |
41 | #include "rsa.h" | 41 | #include "rsa.h" |
@@ -62,7 +62,7 @@ int decode_reply(int type); | |||
62 | /* Returns the number of the authentication fd, or -1 if there is none. */ | 62 | /* Returns the number of the authentication fd, or -1 if there is none. */ |
63 | 63 | ||
64 | int | 64 | int |
65 | ssh_get_authentication_socket() | 65 | ssh_get_authentication_socket(void) |
66 | { | 66 | { |
67 | const char *authsocket; | 67 | const char *authsocket; |
68 | int sock, len; | 68 | int sock, len; |
@@ -171,7 +171,7 @@ ssh_close_authentication_socket(int sock) | |||
171 | */ | 171 | */ |
172 | 172 | ||
173 | AuthenticationConnection * | 173 | AuthenticationConnection * |
174 | ssh_get_authentication_connection() | 174 | ssh_get_authentication_connection(void) |
175 | { | 175 | { |
176 | AuthenticationConnection *auth; | 176 | AuthenticationConnection *auth; |
177 | int sock; | 177 | int sock; |
@@ -272,9 +272,9 @@ ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int versi | |||
272 | Key * | 272 | Key * |
273 | ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version) | 273 | ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version) |
274 | { | 274 | { |
275 | unsigned int bits; | 275 | u_int bits; |
276 | unsigned char *blob; | 276 | u_char *blob; |
277 | unsigned int blen; | 277 | u_int blen; |
278 | Key *key = NULL; | 278 | Key *key = NULL; |
279 | 279 | ||
280 | /* Return failure if no more entries. */ | 280 | /* Return failure if no more entries. */ |
@@ -322,9 +322,9 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio | |||
322 | int | 322 | int |
323 | ssh_decrypt_challenge(AuthenticationConnection *auth, | 323 | ssh_decrypt_challenge(AuthenticationConnection *auth, |
324 | Key* key, BIGNUM *challenge, | 324 | Key* key, BIGNUM *challenge, |
325 | unsigned char session_id[16], | 325 | u_char session_id[16], |
326 | unsigned int response_type, | 326 | u_int response_type, |
327 | unsigned char response[16]) | 327 | u_char response[16]) |
328 | { | 328 | { |
329 | Buffer buffer; | 329 | Buffer buffer; |
330 | int success = 0; | 330 | int success = 0; |
@@ -373,13 +373,13 @@ ssh_decrypt_challenge(AuthenticationConnection *auth, | |||
373 | int | 373 | int |
374 | ssh_agent_sign(AuthenticationConnection *auth, | 374 | ssh_agent_sign(AuthenticationConnection *auth, |
375 | Key *key, | 375 | Key *key, |
376 | unsigned char **sigp, int *lenp, | 376 | u_char **sigp, int *lenp, |
377 | unsigned char *data, int datalen) | 377 | u_char *data, int datalen) |
378 | { | 378 | { |
379 | extern int datafellows; | 379 | extern int datafellows; |
380 | Buffer msg; | 380 | Buffer msg; |
381 | unsigned char *blob; | 381 | u_char *blob; |
382 | unsigned int blen; | 382 | u_int blen; |
383 | int type, flags = 0; | 383 | int type, flags = 0; |
384 | int ret = -1; | 384 | int ret = -1; |
385 | 385 | ||
@@ -502,8 +502,8 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key) | |||
502 | { | 502 | { |
503 | Buffer msg; | 503 | Buffer msg; |
504 | int type; | 504 | int type; |
505 | unsigned char *blob; | 505 | u_char *blob; |
506 | unsigned int blen; | 506 | u_int blen; |
507 | 507 | ||
508 | buffer_init(&msg); | 508 | buffer_init(&msg); |
509 | 509 | ||