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

Return to monitor_wrap.c CVS log

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

Diff for /src/usr.bin/ssh/monitor_wrap.c between version 1.65 and 1.66

version 1.65, 2009/03/05 07:18:19

version 1.66, 2009/05/25 06:48:01

Line 71

/* Imports */

extern int compat20;

extern Newkeys *newkeys[];

extern z_stream incoming_stream;

extern z_stream outgoing_stream;

extern struct monitor *pmonitor;

extern Buffer input, output;

extern Buffer loginmsg;

extern ServerOptions options;

Line 498

Line 496

Enc *enc;

Mac *mac;

Comp *comp;

Newkeys *newkey = newkeys[mode];

Newkeys *newkey = (Newkeys *)packet_get_newkeys(mode);

debug3("%s: converting %p", __func__, newkey);

Line 560

Line 558

void

mm_send_keystate(struct monitor *monitor)

{

Buffer m;

Buffer m, *input, *output;

u_char *blob, *p;

u_int bloblen, plen;

u_int32_t seqnr, packets;

Line 598

Line 596

}

debug3("%s: Sending new keys: %p %p",

__func__, newkeys[MODE_OUT], newkeys[MODE_IN]);

__func__, packet_get_newkeys(MODE_OUT),

packet_get_newkeys(MODE_IN));

/* Keys from Kex */

if (!mm_newkeys_to_blob(MODE_OUT, &blob, &bloblen))

Line 645

Line 644

buffer_put_string(&m, &incoming_stream, sizeof(incoming_stream));

/* Network I/O buffers */

buffer_put_string(&m, buffer_ptr(&input), buffer_len(&input));

input = (Buffer *)packet_get_input();

buffer_put_string(&m, buffer_ptr(&output), buffer_len(&output));

output = (Buffer *)packet_get_output();

buffer_put_string(&m, buffer_ptr(input), buffer_len(input));

buffer_put_string(&m, buffer_ptr(output), buffer_len(output));

mm_request_send(monitor->m_recvfd, MONITOR_REQ_KEYEXPORT, &m);

debug3("%s: Finished sending state", __func__);