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.49 and 1.50

version 1.49, 2001/02/08 19:30:52

version 1.50, 2001/02/11 12:59:25

Line 54

#include "ssh1.h"

#include "ssh2.h"

#include <openssl/bn.h>

#include <openssl/dh.h>

#include <openssl/hmac.h>

#include "cipher.h"

#include "kex.h"

#include "hmac.h"

#include "mac.h"

#include "log.h"

#include "canohost.h"

Line 531

Line 528

void

packet_send2(void)

{

static u_int32_t seqnr = 0;

u_char *macbuf = NULL;

char *cp;

u_int packet_length = 0;

u_int i, padlen, len;

u_int32_t rand = 0;

static u_int seqnr = 0;

int type;

Enc *enc = NULL;

Mac *mac = NULL;

Line 604

Line 601

/* compute MAC over seqnr and packet(length fields, payload, padding) */

if (mac && mac->enabled) {

macbuf = hmac( mac->md, seqnr,

macbuf = mac_compute(mac, seqnr,

(u_char *) buffer_ptr(&outgoing_packet),

buffer_len(&outgoing_packet),

buffer_len(&outgoing_packet));

mac->key, mac->key_len

);

DBG(debug("done calc MAC out #%d", seqnr));

}

/* encrypt packet and append to output buffer. */

Line 818

Line 813

int

packet_read_poll2(int *payload_len_ptr)

{

static u_int32_t seqnr = 0;

static u_int packet_length = 0;

u_int padlen, need;

u_char buf[8], *macbuf;

u_char *ucp;

char *cp;

static u_int packet_length = 0;

static u_int seqnr = 0;

int type;

int maclen, block_size;

Enc *enc = NULL;

Line 883

Line 878

* increment sequence number for incoming packet

if (mac && mac->enabled) {

macbuf = hmac( mac->md, seqnr,

macbuf = mac_compute(mac, seqnr,

(u_char *) buffer_ptr(&incoming_packet),

buffer_len(&incoming_packet),

buffer_len(&incoming_packet));

mac->key, mac->key_len

);

if (memcmp(macbuf, buffer_ptr(&input), mac->mac_len) != 0)

packet_disconnect("Corrupted MAC on input.");

DBG(debug("MAC #%d ok", seqnr));