pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/ssh2 Fixed ssh_encode_* calls to have casts t...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bdb9a7872635
branches: trunk
changeset: 498500:bdb9a7872635
user: kivinen <kivinen%pkgsrc.org@localhost>
date: Wed Aug 24 09:13:24 2005 +0000
description:
Fixed ssh_encode_* calls to have casts to SshUInt32 or size_t
to get it working properly on the 64-bit platform (amd64).
diffstat:
security/ssh2/Makefile | 4 ++--
security/ssh2/distinfo | 10 +++++++++-
security/ssh2/patches/patch-ai | 13 +++++++++++++
security/ssh2/patches/patch-aj | 24 ++++++++++++++++++++++++
security/ssh2/patches/patch-ak | 22 ++++++++++++++++++++++
security/ssh2/patches/patch-al | 13 +++++++++++++
security/ssh2/patches/patch-am | 13 +++++++++++++
security/ssh2/patches/patch-an | 13 +++++++++++++
security/ssh2/patches/patch-ao | 17 +++++++++++++++++
security/ssh2/patches/patch-ap | 14 ++++++++++++++
10 files changed, 140 insertions(+), 3 deletions(-)
diffs (197 lines):
diff -r 6fc9972013ff -r bdb9a7872635 security/ssh2/Makefile
--- a/security/ssh2/Makefile Wed Aug 24 08:49:30 2005 +0000
+++ b/security/ssh2/Makefile Wed Aug 24 09:13:24 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:21 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/24 09:13:24 kivinen Exp $
#
PKGNAME= ${DISTNAME:C/ssh-/ssh2-/}
COMMENT= Secure Shell client and server for V.2 SSH protocol
-PKGREVISION= 3
+PKGREVISION= 4
CONFLICTS= ssh2-nox11-[0-9]*
diff -r 6fc9972013ff -r bdb9a7872635 security/ssh2/distinfo
--- a/security/ssh2/distinfo Wed Aug 24 08:49:30 2005 +0000
+++ b/security/ssh2/distinfo Wed Aug 24 09:13:24 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 13:10:13 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/08/24 09:13:24 kivinen Exp $
SHA1 (ssh-3.2.9.1.tar.gz) = 22e4589c889aef18e53a8942716084f0d8ede7db
RMD160 (ssh-3.2.9.1.tar.gz) = 21bfe97fae477dea1109c6e6eb44a448b6b2f250
@@ -11,3 +11,11 @@
SHA1 (patch-af) = e7c956b858d02dfaf20e1fe1bfc36322d9eb6d67
SHA1 (patch-ag) = 0f7a448875262e2536255ace27cf1a8f0c2a0517
SHA1 (patch-ah) = dc9a496187907e34c602a9f99a65f8fe8a83c54e
+SHA1 (patch-ai) = e5a21bc1c65877e2c2974d78bed16b52d2b486af
+SHA1 (patch-aj) = 4190dff5f6fca937ff742233f8320b126428b51f
+SHA1 (patch-ak) = dd7bc32a5b6cf4e8d8d5d35f46714ce21e52be1b
+SHA1 (patch-al) = 401034768081c4181a92b9d9919ee6f6af9a8a5d
+SHA1 (patch-am) = e0cb5d3f448570be653d8c039c310c3df909583d
+SHA1 (patch-an) = 25a02df00dfe7484354316a87a30ce1144011f87
+SHA1 (patch-ao) = c129f78b7e19843090ade11ae503f780a37921a4
+SHA1 (patch-ap) = 3a7b34777734caf696f9c564f7de431597ff18f6
diff -r 6fc9972013ff -r bdb9a7872635 security/ssh2/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/ssh2/patches/patch-ai Wed Aug 24 09:13:24 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2005/08/24 09:13:24 kivinen Exp $
+
+--- apps/ssh/authc-kbd-interactive.c.orig 2003-12-03 15:17:26.000000000 +0200
++++ apps/ssh/authc-kbd-interactive.c
+@@ -103,7 +103,7 @@ SSH_FSM_STEP(ssh_kbd_process_packet)
+
+ ssh_encode_buffer(gdata->response_packet,
+ SSH_FORMAT_CHAR, SSH_MSG_USERAUTH_INFO_RESPONSE,
+- SSH_FORMAT_UINT32, gdata->num_prompts,
++ SSH_FORMAT_UINT32, (SshUInt32) gdata->num_prompts,
+ SSH_FORMAT_END);
+
+
diff -r 6fc9972013ff -r bdb9a7872635 security/ssh2/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/ssh2/patches/patch-aj Wed Aug 24 09:13:24 2005 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-aj,v 1.1 2005/08/24 09:13:24 kivinen Exp $
+
+--- apps/ssh/lib/sshproto/sshconn.c.orig 2003-12-03 15:17:34.000000000 +0200
++++ apps/ssh/lib/sshproto/sshconn.c
+@@ -452,7 +452,8 @@ Boolean ssh_conn_send_channel_data_type(
+ (unsigned int) SSH_MSG_CHANNEL_DATA,
+ SSH_FORMAT_UINT32, (SshUInt32)
+ channel->remote_id,
+- SSH_FORMAT_UINT32_STR, buf, len,
++ SSH_FORMAT_UINT32_STR, buf,
++ (size_t) len,
+ SSH_FORMAT_END);
+ }
+ else
+@@ -465,7 +466,8 @@ Boolean ssh_conn_send_channel_data_type(
+ SSH_FORMAT_UINT32, (SshUInt32)
+ channel->remote_id,
+ SSH_FORMAT_UINT32, (SshUInt32) i,
+- SSH_FORMAT_UINT32_STR, buf, len,
++ SSH_FORMAT_UINT32_STR, buf,
++ (size_t) len,
+ SSH_FORMAT_END);
+ }
+
diff -r 6fc9972013ff -r bdb9a7872635 security/ssh2/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/ssh2/patches/patch-ak Wed Aug 24 09:13:24 2005 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ak,v 1.1 2005/08/24 09:13:24 kivinen Exp $
+
+--- 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) 0L,
+ 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);
diff -r 6fc9972013ff -r bdb9a7872635 security/ssh2/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/ssh2/patches/patch-al Wed Aug 24 09:13:24 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2005/08/24 09:13:24 kivinen Exp $
+
+--- apps/ssh/ssh-agent2.c.orig 2003-12-03 15:17:27.000000000 +0200
++++ apps/ssh/ssh-agent2.c
+@@ -1802,7 +1802,7 @@ void ssh_agenti_ssh1_encode_mp(SshBuffer
+ num_buf = ssh_xmalloc(num_buf_len);
+ ssh_mp_get_buf(num_buf, num_buf_len, n);
+ ssh_encode_buffer(buffer,
+- SSH_FORMAT_DATA, len_buf, 2,
++ SSH_FORMAT_DATA, len_buf, (size_t) 2,
+ SSH_FORMAT_DATA, num_buf, num_buf_len,
+ SSH_FORMAT_END);
+ ssh_xfree(num_buf);
diff -r 6fc9972013ff -r bdb9a7872635 security/ssh2/patches/patch-am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/ssh2/patches/patch-am Wed Aug 24 09:13:24 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2005/08/24 09:13:24 kivinen Exp $
+
+--- apps/ssh/ssh-signer2.c.orig 2003-12-03 15:17:26.000000000 +0200
++++ apps/ssh/ssh-signer2.c
+@@ -264,7 +264,7 @@ SSH_FSM_STEP(signer_send_error)
+ (unsigned int) gdata->error_code_to_ssh2,
+ SSH_FORMAT_UINT32_STR, gdata->error_message_to_ssh2,
+ strlen(gdata->error_message_to_ssh2),
+- SSH_FORMAT_UINT32_STR, "en", 2,
++ SSH_FORMAT_UINT32_STR, "en", (size_t) 2,
+ SSH_FORMAT_END);
+
+ ssh_packet_wrapper_can_receive(gdata->wrapper, FALSE);
diff -r 6fc9972013ff -r bdb9a7872635 security/ssh2/patches/patch-an
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/ssh2/patches/patch-an Wed Aug 24 09:13:24 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2005/08/24 09:13:24 kivinen Exp $
+
+--- apps/ssh/ssh1proto.c.orig 2003-12-03 15:17:26.000000000 +0200
++++ apps/ssh/ssh1proto.c
+@@ -3918,7 +3918,7 @@ void ssh1_handle_packet_smsg_auth_rsa_ch
+ SSH_FORMAT_UINT32_STR,
+ challenge_buf, challenge_len,
+ SSH_FORMAT_UINT32_STR,
+- ssh1->session_id, 16,
++ ssh1->session_id, (size_t) 16,
+ SSH_FORMAT_END);
+ ssh_xfree(challenge_buf);
+ ssh1->mode = SSH1_AGENT_OPERATION_IN_PROGRESS;
diff -r 6fc9972013ff -r bdb9a7872635 security/ssh2/patches/patch-ao
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/ssh2/patches/patch-ao Wed Aug 24 09:13:24 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.1 2005/08/24 09:13:24 kivinen Exp $
+
+--- apps/ssh/sshchsession.c.orig 2003-12-03 15:17:23.000000000 +0200
++++ apps/ssh/sshchsession.c
+@@ -2315,9 +2315,9 @@ void ssh_channel_session_eof_callback(vo
+ {
+ ssh_encode_buffer(&buffer,
+ SSH_FORMAT_UINT32, (SshUInt32) -exit_status,
+- SSH_FORMAT_BOOLEAN, FALSE,
+- SSH_FORMAT_UINT32_STR, NULL, 0,
+- SSH_FORMAT_UINT32_STR, NULL, 0,
++ SSH_FORMAT_BOOLEAN, (Boolean) FALSE,
++ SSH_FORMAT_UINT32_STR, NULL, (size_t) 0,
++ SSH_FORMAT_UINT32_STR, NULL, (size_t) 0,
+ SSH_FORMAT_END);
+
+
diff -r 6fc9972013ff -r bdb9a7872635 security/ssh2/patches/patch-ap
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/ssh2/patches/patch-ap Wed Aug 24 09:13:24 2005 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ap,v 1.1 2005/08/24 09:13:24 kivinen Exp $
+
+--- apps/ssh/sshpamserver.c.orig 2003-12-03 15:17:26.000000000 +0200
++++ apps/ssh/sshpamserver.c
+@@ -306,7 +306,8 @@ int send_packet(int fd, SshPacketType pa
+
+ buffer = ssh_xbuffer_allocate();
+ ssh_encode_buffer(buffer,
+- SSH_FORMAT_UINT32, ssh_buffer_len(packet) + 1,
++ SSH_FORMAT_UINT32,
++ (SshUInt32) (ssh_buffer_len(packet) + 1),
+ SSH_FORMAT_CHAR, (unsigned int)packet_type,
+ SSH_FORMAT_DATA, ssh_buffer_ptr(packet),
+ ssh_buffer_len(packet),
Home |
Main Index |
Thread Index |
Old Index