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 /cipher.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 'cipher.c')
-rw-r--r-- | cipher.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: cipher.c,v 1.40 2000/12/09 13:41:52 markus Exp $"); | 38 | RCSID("$OpenBSD: cipher.c,v 1.41 2000/12/19 23:17:56 markus Exp $"); |
39 | 39 | ||
40 | #include "ssh.h" | 40 | #include "ssh.h" |
41 | #include "xmalloc.h" | 41 | #include "xmalloc.h" |
@@ -177,7 +177,7 @@ des3_ssh1_decrypt(CipherContext *cc, u_char *dest, const u_char *src, | |||
177 | void | 177 | void |
178 | blowfish_setkey(CipherContext *cc, const u_char *key, u_int keylen) | 178 | blowfish_setkey(CipherContext *cc, const u_char *key, u_int keylen) |
179 | { | 179 | { |
180 | BF_set_key(&cc->u.bf.key, keylen, (unsigned char *)key); | 180 | BF_set_key(&cc->u.bf.key, keylen, (u_char *)key); |
181 | } | 181 | } |
182 | void | 182 | void |
183 | blowfish_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) | 183 | blowfish_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) |
@@ -207,7 +207,7 @@ blowfish_cbc_decrypt(CipherContext *cc, u_char *dest, const u_char *src, | |||
207 | * and after encryption/decryption. Thus the swap_bytes stuff (yuk). | 207 | * and after encryption/decryption. Thus the swap_bytes stuff (yuk). |
208 | */ | 208 | */ |
209 | static void | 209 | static void |
210 | swap_bytes(const unsigned char *src, unsigned char *dst, int n) | 210 | swap_bytes(const u_char *src, u_char *dst, int n) |
211 | { | 211 | { |
212 | char c[4]; | 212 | char c[4]; |
213 | 213 | ||
@@ -260,7 +260,7 @@ arcfour_crypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) | |||
260 | void | 260 | void |
261 | cast_setkey(CipherContext *cc, const u_char *key, u_int keylen) | 261 | cast_setkey(CipherContext *cc, const u_char *key, u_int keylen) |
262 | { | 262 | { |
263 | CAST_set_key(&cc->u.cast.key, keylen, (unsigned char *) key); | 263 | CAST_set_key(&cc->u.cast.key, keylen, (u_char *) key); |
264 | } | 264 | } |
265 | void | 265 | void |
266 | cast_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) | 266 | cast_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) |
@@ -419,10 +419,10 @@ Cipher ciphers[] = { | |||
419 | 419 | ||
420 | /*--*/ | 420 | /*--*/ |
421 | 421 | ||
422 | unsigned int | 422 | u_int |
423 | cipher_mask_ssh1(int client) | 423 | cipher_mask_ssh1(int client) |
424 | { | 424 | { |
425 | unsigned int mask = 0; | 425 | u_int mask = 0; |
426 | mask |= 1 << SSH_CIPHER_3DES; /* Mandatory */ | 426 | mask |= 1 << SSH_CIPHER_3DES; /* Mandatory */ |
427 | mask |= 1 << SSH_CIPHER_BLOWFISH; | 427 | mask |= 1 << SSH_CIPHER_BLOWFISH; |
428 | if (client) { | 428 | if (client) { |
@@ -541,7 +541,7 @@ cipher_set_key_string(CipherContext *cc, Cipher *cipher, | |||
541 | const char *passphrase) | 541 | const char *passphrase) |
542 | { | 542 | { |
543 | MD5_CTX md; | 543 | MD5_CTX md; |
544 | unsigned char digest[16]; | 544 | u_char digest[16]; |
545 | 545 | ||
546 | MD5_Init(&md); | 546 | MD5_Init(&md); |
547 | MD5_Update(&md, (const u_char *)passphrase, strlen(passphrase)); | 547 | MD5_Update(&md, (const u_char *)passphrase, strlen(passphrase)); |