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 /packet.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 'packet.h')
-rw-r--r-- | packet.h | 22 |
1 files changed, 11 insertions, 11 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: packet.h,v 1.17 2000/09/07 20:27:52 deraadt Exp $"); */ | 14 | /* RCSID("$OpenBSD: packet.h,v 1.18 2000/12/19 23:17:57 markus Exp $"); */ |
15 | 15 | ||
16 | #ifndef PACKET_H | 16 | #ifndef PACKET_H |
17 | #define PACKET_H | 17 | #define PACKET_H |
@@ -46,17 +46,17 @@ void packet_close(void); | |||
46 | * encrypted independently of each other. Cipher types are defined in ssh.h. | 46 | * encrypted independently of each other. Cipher types are defined in ssh.h. |
47 | */ | 47 | */ |
48 | void | 48 | void |
49 | packet_set_encryption_key(const unsigned char *key, unsigned int keylen, | 49 | packet_set_encryption_key(const u_char *key, u_int keylen, |
50 | int cipher_type); | 50 | int cipher_type); |
51 | 51 | ||
52 | /* | 52 | /* |
53 | * Sets remote side protocol flags for the current connection. This can be | 53 | * Sets remote side protocol flags for the current connection. This can be |
54 | * called at any time. | 54 | * called at any time. |
55 | */ | 55 | */ |
56 | void packet_set_protocol_flags(unsigned int flags); | 56 | void packet_set_protocol_flags(u_int flags); |
57 | 57 | ||
58 | /* Returns the remote protocol flags set earlier by the above function. */ | 58 | /* Returns the remote protocol flags set earlier by the above function. */ |
59 | unsigned int packet_get_protocol_flags(void); | 59 | u_int packet_get_protocol_flags(void); |
60 | 60 | ||
61 | /* Enables compression in both directions starting from the next packet. */ | 61 | /* Enables compression in both directions starting from the next packet. */ |
62 | void packet_start_compression(int level); | 62 | void packet_start_compression(int level); |
@@ -77,16 +77,16 @@ void packet_start(int type); | |||
77 | void packet_put_char(int ch); | 77 | void packet_put_char(int ch); |
78 | 78 | ||
79 | /* Appends an integer to the packet data. */ | 79 | /* Appends an integer to the packet data. */ |
80 | void packet_put_int(unsigned int value); | 80 | void packet_put_int(u_int value); |
81 | 81 | ||
82 | /* Appends an arbitrary precision integer to packet data. */ | 82 | /* Appends an arbitrary precision integer to packet data. */ |
83 | void packet_put_bignum(BIGNUM * value); | 83 | void packet_put_bignum(BIGNUM * value); |
84 | void packet_put_bignum2(BIGNUM * value); | 84 | void packet_put_bignum2(BIGNUM * value); |
85 | 85 | ||
86 | /* Appends a string to packet data. */ | 86 | /* Appends a string to packet data. */ |
87 | void packet_put_string(const char *buf, unsigned int len); | 87 | void packet_put_string(const char *buf, u_int len); |
88 | void packet_put_cstring(const char *str); | 88 | void packet_put_cstring(const char *str); |
89 | void packet_put_raw(const char *buf, unsigned int len); | 89 | void packet_put_raw(const char *buf, u_int len); |
90 | 90 | ||
91 | /* | 91 | /* |
92 | * Finalizes and sends the packet. If the encryption key has been set, | 92 | * Finalizes and sends the packet. If the encryption key has been set, |
@@ -117,13 +117,13 @@ int packet_read_poll(int *packet_len_ptr); | |||
117 | * Buffers the given amount of input characters. This is intended to be used | 117 | * Buffers the given amount of input characters. This is intended to be used |
118 | * together with packet_read_poll. | 118 | * together with packet_read_poll. |
119 | */ | 119 | */ |
120 | void packet_process_incoming(const char *buf, unsigned int len); | 120 | void packet_process_incoming(const char *buf, u_int len); |
121 | 121 | ||
122 | /* Returns a character (0-255) from the packet data. */ | 122 | /* Returns a character (0-255) from the packet data. */ |
123 | unsigned int packet_get_char(void); | 123 | u_int packet_get_char(void); |
124 | 124 | ||
125 | /* Returns an integer from the packet data. */ | 125 | /* Returns an integer from the packet data. */ |
126 | unsigned int packet_get_int(void); | 126 | u_int packet_get_int(void); |
127 | 127 | ||
128 | /* | 128 | /* |
129 | * Returns an arbitrary precision integer from the packet data. The integer | 129 | * Returns an arbitrary precision integer from the packet data. The integer |
@@ -139,7 +139,7 @@ char *packet_get_raw(int *length_ptr); | |||
139 | * no longer needed. The length_ptr argument may be NULL, or point to an | 139 | * no longer needed. The length_ptr argument may be NULL, or point to an |
140 | * integer into which the length of the string is stored. | 140 | * integer into which the length of the string is stored. |
141 | */ | 141 | */ |
142 | char *packet_get_string(unsigned int *length_ptr); | 142 | char *packet_get_string(u_int *length_ptr); |
143 | 143 | ||
144 | /* | 144 | /* |
145 | * Logs the error in syslog using LOG_INFO, constructs and sends a disconnect | 145 | * Logs the error in syslog using LOG_INFO, constructs and sends a disconnect |