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.h | |
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.h')
-rw-r--r-- | authfd.h | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -11,7 +11,7 @@ | |||
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$OpenBSD: authfd.h,v 1.14 2000/11/12 19:50:37 markus Exp $"); */ | 14 | /* RCSID("$OpenBSD: authfd.h,v 1.16 2000/12/20 19:37:21 markus Exp $"); */ |
15 | 15 | ||
16 | #ifndef AUTHFD_H | 16 | #ifndef AUTHFD_H |
17 | #define AUTHFD_H | 17 | #define AUTHFD_H |
@@ -51,7 +51,7 @@ typedef struct { | |||
51 | } AuthenticationConnection; | 51 | } AuthenticationConnection; |
52 | 52 | ||
53 | /* Returns the number of the authentication fd, or -1 if there is none. */ | 53 | /* Returns the number of the authentication fd, or -1 if there is none. */ |
54 | int ssh_get_authentication_socket(); | 54 | int ssh_get_authentication_socket(void); |
55 | 55 | ||
56 | /* | 56 | /* |
57 | * This should be called for any descriptor returned by | 57 | * This should be called for any descriptor returned by |
@@ -66,7 +66,7 @@ void ssh_close_authentication_socket(int authfd); | |||
66 | * connection could not be opened. The connection should be closed by the | 66 | * connection could not be opened. The connection should be closed by the |
67 | * caller by calling ssh_close_authentication_connection(). | 67 | * caller by calling ssh_close_authentication_connection(). |
68 | */ | 68 | */ |
69 | AuthenticationConnection *ssh_get_authentication_connection(); | 69 | AuthenticationConnection *ssh_get_authentication_connection(void); |
70 | 70 | ||
71 | /* | 71 | /* |
72 | * Closes the connection to the authentication agent and frees any associated | 72 | * Closes the connection to the authentication agent and frees any associated |
@@ -101,16 +101,16 @@ Key *ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int v | |||
101 | int | 101 | int |
102 | ssh_decrypt_challenge(AuthenticationConnection *auth, | 102 | ssh_decrypt_challenge(AuthenticationConnection *auth, |
103 | Key *key, BIGNUM * challenge, | 103 | Key *key, BIGNUM * challenge, |
104 | unsigned char session_id[16], | 104 | u_char session_id[16], |
105 | unsigned int response_type, | 105 | u_int response_type, |
106 | unsigned char response[16]); | 106 | u_char response[16]); |
107 | 107 | ||
108 | /* Requests the agent to sign data using key */ | 108 | /* Requests the agent to sign data using key */ |
109 | int | 109 | int |
110 | ssh_agent_sign(AuthenticationConnection *auth, | 110 | ssh_agent_sign(AuthenticationConnection *auth, |
111 | Key *key, | 111 | Key *key, |
112 | unsigned char **sigp, int *lenp, | 112 | u_char **sigp, int *lenp, |
113 | unsigned char *data, int datalen); | 113 | u_char *data, int datalen); |
114 | 114 | ||
115 | /* | 115 | /* |
116 | * Adds an identity to the authentication server. This call is not meant to | 116 | * Adds an identity to the authentication server. This call is not meant to |