1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00
freebsd-ports/security/ssh2/files/patch-apps::ssh::lib::sshproto::trcommon.c
Marius Strobl d47f13ae97 - Cast the arguments of ssh_conn_send_channel_data_type() and
ssh_encode_{array_alloc,buffer}() calls as appropriate in order to
  fix argument size problems on 64-bit platforms and that manifest
  themselves on amd64 and ia64. [1]
- Allow the tcsetattr(3) calls in ssh_rl_{restore,set}_tty_modes_for_fd()
  to be interrupted by signal. This fixes occasional problems when
  connecting to a host for the first time.
- Use the base zlib instead of the one shipping with SSH; although the
  latter has an enhancement allowing a minor SSH-specific optimization,
  using the base one has the benefit of not needing to track security
  vulnerabilities of zlib in this port (SSH 3.2.9.1 ships with zlib
  1.1.4 which is not know to be vulnerable though).
- Try to make the description of the WITHOUT_X11 option of the port
  Makefile to be more sentence-like.

PR:		98016 [1]
Approved by:	netchild
Obtained from:	NetBSD [1]
2006-08-28 00:03:21 +00:00

21 lines
1.0 KiB
C

--- apps/ssh/lib/sshproto/trcommon.c.orig 2003-12-03 15:17:33.000000000 +0200
+++ apps/ssh/lib/sshproto/trcommon.c
@@ -555,7 +555,7 @@ void ssh_tr_send_packet(SshTransportComm
SSH_DEBUG(5, ("Outgoing empty, sending empty ignore packet."));
ret = ssh_encode_buffer(&new_packet,
SSH_FORMAT_CHAR, (unsigned int) SSH_MSG_IGNORE,
- SSH_FORMAT_UINT32, 0L,
+ SSH_FORMAT_UINT32, (SshUInt32) 0,
SSH_FORMAT_END);
SSH_VERIFY(ret > 0);
ssh_tr_encode_packet(tr, ssh_buffer_ptr(&new_packet),
@@ -3171,7 +3171,7 @@ void ssh_tr_process_up_incoming_packet(S
ssh_encode_buffer(new_packet,
SSH_FORMAT_CHAR, (unsigned int) SSH_MSG_IGNORE,
- SSH_FORMAT_UINT32, ignore_len,
+ SSH_FORMAT_UINT32, (SshUInt32) ignore_len,
SSH_FORMAT_END);
ssh_xbuffer_append_space(new_packet, &datap, ignore_len);