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 /kex.h | |
| parent | a074feb65d6f1fcad02e80b751e2287fd6230b09 (diff) | |
| download | openssh-git-46c162204b5a6f7471525c2f75cb2c607c88b83f.tar.gz | |
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 'kex.h')
| -rw-r--r-- | kex.h | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -62,15 +62,15 @@ struct Enc { char *name; Cipher *cipher; int enabled; - unsigned char *key; - unsigned char *iv; + u_char *key; + u_char *iv; }; struct Mac { char *name; int enabled; EVP_MD *md; int mac_len; - unsigned char *key; + u_char *key; int key_len; }; struct Comp { @@ -97,15 +97,15 @@ kex_exchange_kexinit( Kex * kex_choose_conf(char *cprop[PROPOSAL_MAX], char *sprop[PROPOSAL_MAX], int server); -int kex_derive_keys(Kex *k, unsigned char *hash, BIGNUM *shared_secret); +int kex_derive_keys(Kex *k, u_char *hash, BIGNUM *shared_secret); void packet_set_kex(Kex *k); int dh_pub_is_valid(DH *dh, BIGNUM *dh_pub); DH *dh_new_group_asc(const char *, const char *); DH *dh_new_group(BIGNUM *, BIGNUM *); -void dh_gen_key(); -DH *dh_new_group1(); +void dh_gen_key(DH *); +DH *dh_new_group1(void); -unsigned char * +u_char * kex_hash( char *client_version_string, char *server_version_string, @@ -116,7 +116,7 @@ kex_hash( BIGNUM *server_dh_pub, BIGNUM *shared_secret); -unsigned char * +u_char * kex_hash_gex( char *client_version_string, char *server_version_string, |