diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-10-01 18:18:57 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-10-01 18:18:57 +0000 |
commit | d5bbae0ace3dcb8c40cb2a5c83451b79622a88cf (patch) | |
tree | d4950715fe17aa316bb306c022d798164b83e636 | |
parent | 6ccebfddaac0721e378cde5ed1ab2d5dfc187ba3 (diff) |
s/long/int/
-rw-r--r-- | usr.bin/ssh/auth-krb4.c | 4 | ||||
-rw-r--r-- | usr.bin/ssh/crc32.c | 8 | ||||
-rw-r--r-- | usr.bin/ssh/crc32.h | 4 | ||||
-rw-r--r-- | usr.bin/ssh/packet.c | 6 | ||||
-rw-r--r-- | usr.bin/ssh/radix.c | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/usr.bin/ssh/auth-krb4.c b/usr.bin/ssh/auth-krb4.c index 677a0f883d2..52952927ffc 100644 --- a/usr.bin/ssh/auth-krb4.c +++ b/usr.bin/ssh/auth-krb4.c @@ -6,7 +6,7 @@ Kerberos v4 authentication and ticket-passing routines. - $Id: auth-krb4.c,v 1.3 1999/09/29 21:14:15 deraadt Exp $ + $Id: auth-krb4.c,v 1.4 1999/10/01 18:18:40 deraadt Exp $ */ #include "includes.h" @@ -56,7 +56,7 @@ int auth_krb4(const char *server_user, KTEXT auth, char **client) KTEXT_ST reply; char instance[INST_SZ]; int r, s; - u_long cksum; + u_int cksum; Key_schedule schedule; struct sockaddr_in local, foreign; diff --git a/usr.bin/ssh/crc32.c b/usr.bin/ssh/crc32.c index 7473e278279..f6082f375f0 100644 --- a/usr.bin/ssh/crc32.c +++ b/usr.bin/ssh/crc32.c @@ -3,7 +3,7 @@ crc32-function (including changing the interface). //ylo */ #include "includes.h" -RCSID("$Id: crc32.c,v 1.1 1999/09/26 20:53:35 deraadt Exp $"); +RCSID("$Id: crc32.c,v 1.2 1999/10/01 18:18:40 deraadt Exp $"); #include "crc32.h" @@ -47,7 +47,7 @@ RCSID("$Id: crc32.c,v 1.1 1999/09/26 20:53:35 deraadt Exp $"); /* */ /* -------------------------------------------------------------------- */ -static unsigned long crc32_tab[] = { +static unsigned int crc32_tab[] = { 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, @@ -104,10 +104,10 @@ static unsigned long crc32_tab[] = { /* Return a 32-bit CRC of the contents of the buffer. */ -unsigned long crc32(const unsigned char *s, unsigned int len) +unsigned int crc32(const unsigned char *s, unsigned int len) { unsigned int i; - unsigned long crc32val; + unsigned int crc32val; crc32val = 0; for (i = 0; i < len; i ++) diff --git a/usr.bin/ssh/crc32.h b/usr.bin/ssh/crc32.h index dbc0a2fb1e7..de7704d6da5 100644 --- a/usr.bin/ssh/crc32.h +++ b/usr.bin/ssh/crc32.h @@ -13,13 +13,13 @@ Functions for computing 32-bit CRC. */ -/* RCSID("$Id: crc32.h,v 1.1 1999/09/26 20:53:35 deraadt Exp $"); */ +/* RCSID("$Id: crc32.h,v 1.2 1999/10/01 18:18:56 deraadt Exp $"); */ #ifndef CRC32_H #define CRC32_H /* This computes a 32 bit CRC of the data in the buffer, and returns the CRC. The polynomial used is 0xedb88320. */ -unsigned long crc32(const unsigned char *buf, unsigned int len); +unsigned int crc32(const unsigned char *buf, unsigned int len); #endif /* CRC32_H */ diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index 4bd50e7fc19..f6bf5f85d1a 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/packet.c @@ -15,7 +15,7 @@ with the other side. This same code is used both on client and server side. */ #include "includes.h" -RCSID("$Id: packet.c,v 1.6 1999/09/30 05:53:04 deraadt Exp $"); +RCSID("$Id: packet.c,v 1.7 1999/10/01 18:18:40 deraadt Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -294,7 +294,7 @@ packet_send() { char buf[8], *cp; int i, padding, len; - unsigned long checksum; + unsigned int checksum; u_int32_t rand = 0; /* If using packet compression, compress the payload of the outgoing @@ -437,7 +437,7 @@ packet_read_poll(int *payload_len_ptr) unsigned int len, padded_len; unsigned char *ucp; char buf[8], *cp; - unsigned long checksum, stored_checksum; + unsigned int checksum, stored_checksum; restart: diff --git a/usr.bin/ssh/radix.c b/usr.bin/ssh/radix.c index c1564383693..1c497945e52 100644 --- a/usr.bin/ssh/radix.c +++ b/usr.bin/ssh/radix.c @@ -175,8 +175,8 @@ int creds_to_radix(CREDENTIALS *creds, unsigned char *buf) PUTLONG(creds->issue_date,p); { - unsigned long endTime ; - endTime = (unsigned long)krb_life_to_time(creds->issue_date, + unsigned int endTime ; + endTime = (unsigned int)krb_life_to_time(creds->issue_date, creds->lifetime); PUTLONG(endTime,p); } @@ -229,7 +229,7 @@ int radix_to_creds(const char *buf, CREDENTIALS *creds) GETLONG(creds->issue_date,p); len -= 4; { - unsigned long endTime; + unsigned int endTime; GETLONG(endTime,p); len -= 4; creds->lifetime = krb_time_to_life(creds->issue_date, endTime); |