summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--bufaux.c4
-rw-r--r--channels.c10
-rw-r--r--packet.c4
4 files changed, 13 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index da5a1ded5..407649967 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -168,6 +168,9 @@
168 - deraadt@cvs.openbsd.org 2006/03/25 18:43:30 168 - deraadt@cvs.openbsd.org 2006/03/25 18:43:30
169 [channels.c] 169 [channels.c]
170 use strtonum() instead of atoi() [limit X screens to 400, sorry] 170 use strtonum() instead of atoi() [limit X screens to 400, sorry]
171 - deraadt@cvs.openbsd.org 2006/03/25 18:56:55
172 [bufaux.c channels.c packet.c]
173 remove (char *) casts to a function that accepts void * for the arg
171 174
17220060325 17520060325
173 - OpenBSD CVS Sync 176 - OpenBSD CVS Sync
@@ -4425,4 +4428,4 @@
4425 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4428 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4426 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4429 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4427 4430
4428$Id: ChangeLog,v 1.4283 2006/03/26 03:28:32 djm Exp $ 4431$Id: ChangeLog,v 1.4284 2006/03/26 03:28:50 djm Exp $
diff --git a/bufaux.c b/bufaux.c
index b7c9f2ecd..21a2badf1 100644
--- a/bufaux.c
+++ b/bufaux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bufaux.c,v 1.39 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: bufaux.c,v 1.40 2006/03/25 18:56:54 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -71,7 +71,7 @@ buffer_put_bignum_ret(Buffer *buffer, const BIGNUM *value)
71 PUT_16BIT(msg, bits); 71 PUT_16BIT(msg, bits);
72 buffer_append(buffer, msg, 2); 72 buffer_append(buffer, msg, 2);
73 /* Store the binary data. */ 73 /* Store the binary data. */
74 buffer_append(buffer, (char *)buf, oi); 74 buffer_append(buffer, buf, oi);
75 75
76 memset(buf, 0, bin_size); 76 memset(buf, 0, bin_size);
77 xfree(buf); 77 xfree(buf);
diff --git a/channels.c b/channels.c
index 70ffd7b33..57634a21d 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.245 2006/03/25 18:43:30 deraadt Exp $ */ 1/* $OpenBSD: channels.c,v 1.246 2006/03/25 18:56:54 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -988,7 +988,7 @@ channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset)
988 s4_rsp.command = 90; /* cd: req granted */ 988 s4_rsp.command = 90; /* cd: req granted */
989 s4_rsp.dest_port = 0; /* ignored */ 989 s4_rsp.dest_port = 0; /* ignored */
990 s4_rsp.dest_addr.s_addr = INADDR_ANY; /* ignored */ 990 s4_rsp.dest_addr.s_addr = INADDR_ANY; /* ignored */
991 buffer_append(&c->output, (char *)&s4_rsp, sizeof(s4_rsp)); 991 buffer_append(&c->output, &s4_rsp, sizeof(s4_rsp));
992 return 1; 992 return 1;
993} 993}
994 994
@@ -1097,9 +1097,9 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)
1097 ((struct in_addr *)&dest_addr)->s_addr = INADDR_ANY; 1097 ((struct in_addr *)&dest_addr)->s_addr = INADDR_ANY;
1098 dest_port = 0; /* ignored */ 1098 dest_port = 0; /* ignored */
1099 1099
1100 buffer_append(&c->output, (char *)&s5_rsp, sizeof(s5_rsp)); 1100 buffer_append(&c->output, &s5_rsp, sizeof(s5_rsp));
1101 buffer_append(&c->output, (char *)&dest_addr, sizeof(struct in_addr)); 1101 buffer_append(&c->output, &dest_addr, sizeof(struct in_addr));
1102 buffer_append(&c->output, (char *)&dest_port, sizeof(dest_port)); 1102 buffer_append(&c->output, &dest_port, sizeof(dest_port));
1103 return 1; 1103 return 1;
1104} 1104}
1105 1105
diff --git a/packet.c b/packet.c
index fceeef666..5eb2c1c9e 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.129 2006/03/25 18:29:35 deraadt Exp $ */ 1/* $OpenBSD: packet.c,v 1.130 2006/03/25 18:56:55 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -788,7 +788,7 @@ packet_send2_wrapped(void)
788 buffer_len(&outgoing_packet)); 788 buffer_len(&outgoing_packet));
789 /* append unencrypted MAC */ 789 /* append unencrypted MAC */
790 if (mac && mac->enabled) 790 if (mac && mac->enabled)
791 buffer_append(&output, (char *)macbuf, mac->mac_len); 791 buffer_append(&output, macbuf, mac->mac_len);
792#ifdef PACKET_DEBUG 792#ifdef PACKET_DEBUG
793 fprintf(stderr, "encrypted: "); 793 fprintf(stderr, "encrypted: ");
794 buffer_dump(&output); 794 buffer_dump(&output);