src/usr.bin/ssh/packet.c - diff

Return to packet.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/packet.c between version 1.130 and 1.131

version 1.130, 2006/03/25 18:56:55

version 1.131, 2006/03/30 09:58:16

Line 49

#include "packet.h"

#include "bufaux.h"

#include "crc32.h"

#include "getput.h"

#include "compress.h"

#include "deattack.h"

Line 555

Line 554

/* Add check bytes. */

checksum = ssh_crc32(buffer_ptr(&outgoing_packet),

buffer_len(&outgoing_packet));

PUT_32BIT(buf, checksum);

put_u32(buf, checksum);

buffer_append(&outgoing_packet, buf, 4);

#ifdef PACKET_DEBUG

Line 564

Line 563

#endif

/* Append to output. */

PUT_32BIT(buf, len);

put_u32(buf, len);

buffer_append(&output, buf, 4);

cp = buffer_append_space(&output, buffer_len(&outgoing_packet));

cipher_crypt(&send_context, cp, buffer_ptr(&outgoing_packet),

Line 767

Line 766

/* packet_length includes payload, padding and padding length field */

packet_length = buffer_len(&outgoing_packet) - 4;

cp = buffer_ptr(&outgoing_packet);

PUT_32BIT(cp, packet_length);

put_u32(cp, packet_length);

cp[4] = padlen;

DBG(debug("send: len %d (includes padlen %d)", packet_length+4, padlen));

Line 965

Line 964

return SSH_MSG_NONE;

/* Get length of incoming packet. */

cp = buffer_ptr(&input);

len = GET_32BIT(cp);

len = get_u32(cp);

if (len < 1 + 2 + 2 || len > 256 * 1024)

packet_disconnect("Bad packet length %u.", len);

padded_len = (len + 8) & ~7;

Line 1013

Line 1012

len, buffer_len(&incoming_packet));

cp = (u_char *)buffer_ptr(&incoming_packet) + len - 4;

stored_checksum = GET_32BIT(cp);

stored_checksum = get_u32(cp);

if (checksum != stored_checksum)

packet_disconnect("Corrupted check bytes on input.");

buffer_consume_end(&incoming_packet, 4);

Line 1062

Line 1061

cipher_crypt(&receive_context, cp, buffer_ptr(&input),

block_size);

cp = buffer_ptr(&incoming_packet);

packet_length = GET_32BIT(cp);

packet_length = get_u32(cp);

if (packet_length < 1 + 4 || packet_length > 256 * 1024) {

#ifdef PACKET_DEBUG

buffer_dump(&incoming_packet);