diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-08-19 02:17:13 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-08-19 02:17:13 +0000 |
| commit | 9a6fdf5d9ae540a47d91df671f3e481e9ea03526 (patch) | |
| tree | 6f5b0633d80bde4522e1e298e5fb6f536dc9651f | |
| parent | 625d6ad914e8a05416669d6d14950fdcbedc22aa (diff) | |
rename crc32() to ssh_crc32() to avoid zlib name clash. do not move to
libz crc32 function yet, because it has ugly "long"'s in it; oneill@cs.sfu.ca
| -rw-r--r-- | usr.bin/ssh/crc32.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/deattack.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/packet.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/crc32.c b/usr.bin/ssh/crc32.c index 05a1af7b35a..eb9b2dcd44e 100644 --- a/usr.bin/ssh/crc32.c +++ b/usr.bin/ssh/crc32.c @@ -6,7 +6,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: crc32.c,v 1.5 2000/06/20 01:39:40 markus Exp $"); +RCSID("$OpenBSD: crc32.c,v 1.6 2000/08/19 02:17:12 deraadt Exp $"); #include "crc32.h" @@ -108,7 +108,7 @@ static unsigned int crc32_tab[] = { /* Return a 32-bit CRC of the contents of the buffer. */ unsigned int -crc32(const unsigned char *s, unsigned int len) +ssh_crc32(const unsigned char *s, unsigned int len) { unsigned int i; unsigned int crc32val; diff --git a/usr.bin/ssh/deattack.c b/usr.bin/ssh/deattack.c index 7f95eca3199..72e7f1e0611 100644 --- a/usr.bin/ssh/deattack.c +++ b/usr.bin/ssh/deattack.c @@ -1,5 +1,5 @@ /* - * $OpenBSD: deattack.c,v 1.7 2000/06/20 01:39:41 markus Exp $ + * $OpenBSD: deattack.c,v 1.8 2000/08/19 02:17:12 deraadt Exp $ * Cryptographic attack detector for ssh - source code * * Copyright (c) 1998 CORE SDI S.A., Buenos Aires, Argentina. @@ -50,7 +50,7 @@ void crc_update(u_int32_t *a, u_int32_t b) { b ^= *a; - *a = crc32((unsigned char *) &b, sizeof(b)); + *a = ssh_crc32((unsigned char *) &b, sizeof(b)); } /* detect if a block is used in a particular pattern */ diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index 9c82e4db8f6..d2ac186f2e6 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/packet.c @@ -17,7 +17,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: packet.c,v 1.33 2000/06/20 01:39:43 markus Exp $"); +RCSID("$OpenBSD: packet.c,v 1.34 2000/08/19 02:17:12 deraadt Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -479,8 +479,8 @@ packet_send1() buffer_consume(&outgoing_packet, 8 - padding); /* Add check bytes. */ - checksum = crc32((unsigned char *) buffer_ptr(&outgoing_packet), - buffer_len(&outgoing_packet)); + checksum = ssh_crc32((unsigned char *) buffer_ptr(&outgoing_packet), + buffer_len(&outgoing_packet)); PUT_32BIT(buf, checksum); buffer_append(&outgoing_packet, buf, 4); @@ -764,7 +764,7 @@ packet_read_poll1(int *payload_len_ptr) #endif /* Compute packet checksum. */ - checksum = crc32((unsigned char *) buffer_ptr(&incoming_packet), + checksum = ssh_crc32((unsigned char *) buffer_ptr(&incoming_packet), buffer_len(&incoming_packet) - 4); /* Skip padding. */ |