=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/packet.c,v retrieving revision 1.61.2.5 retrieving revision 1.62 diff -u -r1.61.2.5 -r1.62 --- src/usr.bin/ssh/packet.c 2002/06/02 22:56:10 1.61.2.5 +++ src/usr.bin/ssh/packet.c 2001/05/28 23:58:35 1.62 @@ -13,7 +13,7 @@ * * * SSH2 packet format added by Markus Friedl. - * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. + * Copyright (c) 2000 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,7 +37,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: packet.c,v 1.61.2.5 2002/06/02 22:56:10 miod Exp $"); +RCSID("$OpenBSD: packet.c,v 1.62 2001/05/28 23:58:35 markus Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -59,7 +59,6 @@ #include "mac.h" #include "log.h" #include "canohost.h" -#include "misc.h" #ifdef PACKET_DEBUG #define DBG(x) x @@ -86,10 +85,10 @@ static CipherContext send_context; /* Buffer for raw input data from the socket. */ -Buffer input; +static Buffer input; /* Buffer for raw output data going to the socket. */ -Buffer output; +static Buffer output; /* Buffer for the partial outgoing packet being constructed. */ static Buffer outgoing_packet; @@ -115,12 +114,7 @@ /* Session key information for Encryption and MAC */ Newkeys *newkeys[MODE_MAX]; -static u_int32_t read_seqnr = 0; -static u_int32_t send_seqnr = 0; -/* roundup current message to extra_pad bytes */ -static u_char extra_pad = 0; - /* * Sets the descriptors used for communication. Disables encryption until * packet_set_encryption_key is called. @@ -133,8 +127,8 @@ fatal("packet_set_connection: cannot load cipher 'none'"); connection_in = fd_in; connection_out = fd_out; - cipher_init(&send_context, none, "", 0, NULL, 0, CIPHER_ENCRYPT); - cipher_init(&receive_context, none, "", 0, NULL, 0, CIPHER_DECRYPT); + cipher_init(&send_context, none, (u_char *) "", 0, NULL, 0); + cipher_init(&receive_context, none, (u_char *) "", 0, NULL, 0); newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL; if (!initialized) { initialized = 1; @@ -150,7 +144,7 @@ /* Returns 1 if remote host is connected via socket, 0 if not. */ int -packet_connection_is_on_socket(void) +packet_connection_is_on_socket() { struct sockaddr_storage from, to; socklen_t fromlen, tolen; @@ -173,103 +167,10 @@ return 1; } -/* - * Exports an IV from the CipherContext required to export the key - * state back from the unprivileged child to the privileged parent - * process. - */ - -void -packet_get_keyiv(int mode, u_char *iv, u_int len) -{ - CipherContext *cc; - - if (mode == MODE_OUT) - cc = &send_context; - else - cc = &receive_context; - - cipher_get_keyiv(cc, iv, len); -} - -int -packet_get_keycontext(int mode, u_char *dat) -{ - CipherContext *cc; - - if (mode == MODE_OUT) - cc = &send_context; - else - cc = &receive_context; - - return (cipher_get_keycontext(cc, dat)); -} - -void -packet_set_keycontext(int mode, u_char *dat) -{ - CipherContext *cc; - - if (mode == MODE_OUT) - cc = &send_context; - else - cc = &receive_context; - - cipher_set_keycontext(cc, dat); -} - -int -packet_get_keyiv_len(int mode) -{ - CipherContext *cc; - - if (mode == MODE_OUT) - cc = &send_context; - else - cc = &receive_context; - - return (cipher_get_keyiv_len(cc)); -} -void -packet_set_iv(int mode, u_char *dat) -{ - CipherContext *cc; - - if (mode == MODE_OUT) - cc = &send_context; - else - cc = &receive_context; - - cipher_set_keyiv(cc, dat); -} -int -packet_get_ssh1_cipher() -{ - return (cipher_get_number(receive_context.cipher)); -} - - -u_int32_t -packet_get_seqnr(int mode) -{ - return (mode == MODE_IN ? read_seqnr : send_seqnr); -} - -void -packet_set_seqnr(int mode, u_int32_t seqnr) -{ - if (mode == MODE_IN) - read_seqnr = seqnr; - else if (mode == MODE_OUT) - send_seqnr = seqnr; - else - fatal("%s: bad mode %d", __FUNCTION__, mode); -} - /* returns 1 if connection is via ipv4 */ int -packet_connection_is_ipv4(void) +packet_connection_is_ipv4() { struct sockaddr_storage to; socklen_t tolen = sizeof(to); @@ -285,7 +186,7 @@ /* Sets the connection into non-blocking mode. */ void -packet_set_nonblocking(void) +packet_set_nonblocking() { /* Set the socket into non-blocking mode. */ if (fcntl(connection_in, F_SETFL, O_NONBLOCK) < 0) @@ -300,7 +201,7 @@ /* Returns the socket used for reading. */ int -packet_get_connection_in(void) +packet_get_connection_in() { return connection_in; } @@ -308,7 +209,7 @@ /* Returns the descriptor used for writing. */ int -packet_get_connection_out(void) +packet_get_connection_out() { return connection_out; } @@ -316,7 +217,7 @@ /* Closes the connection and clears and frees internal data structures. */ void -packet_close(void) +packet_close() { if (!initialized) return; @@ -336,8 +237,6 @@ buffer_free(&compression_buffer); buffer_compress_uninit(); } - cipher_cleanup(&send_context); - cipher_cleanup(&receive_context); } /* Sets remote side protocol flags. */ @@ -346,12 +245,13 @@ packet_set_protocol_flags(u_int protocol_flags) { remote_protocol_flags = protocol_flags; + channel_set_options((protocol_flags & SSH_PROTOFLAG_HOST_IN_FWD_OPEN) != 0); } /* Returns the remote protocol flags set earlier by the above function. */ u_int -packet_get_protocol_flags(void) +packet_get_protocol_flags() { return remote_protocol_flags; } @@ -361,8 +261,8 @@ * Level is compression level 1 (fastest) - 9 (slow, best) as in gzip. */ -static void -packet_init_compression(void) +void +packet_init_compression() { if (compression_buffer_ready == 1) return; @@ -395,8 +295,8 @@ fatal("packet_set_encryption_key: unknown cipher number %d", number); if (keylen < 20) fatal("packet_set_encryption_key: keylen too small: %d", keylen); - cipher_init(&send_context, cipher, key, keylen, NULL, 0, CIPHER_ENCRYPT); - cipher_init(&receive_context, cipher, key, keylen, NULL, 0, CIPHER_DECRYPT); + cipher_init(&receive_context, cipher, key, keylen, NULL, 0); + cipher_init(&send_context, cipher, key, keylen, NULL, 0); } /* Start constructing a packet to send. */ @@ -427,17 +327,17 @@ buffer_put_int(&outgoing_packet, value); } void -packet_put_string(const void *buf, u_int len) +packet_put_string(const char *buf, u_int len) { buffer_put_string(&outgoing_packet, buf, len); } void packet_put_cstring(const char *str) { - buffer_put_cstring(&outgoing_packet, str); + buffer_put_string(&outgoing_packet, str, strlen(str)); } void -packet_put_raw(const void *buf, u_int len) +packet_put_raw(const char *buf, u_int len) { buffer_append(&outgoing_packet, buf, len); } @@ -457,10 +357,10 @@ * encrypts the packet before sending. */ -static void +void packet_send1(void) { - u_char buf[8], *cp; + char buf[8], *cp; int i, padding, len; u_int checksum; u_int32_t rand = 0; @@ -478,14 +378,14 @@ buffer_compress(&outgoing_packet, &compression_buffer); buffer_clear(&outgoing_packet); buffer_append(&outgoing_packet, buffer_ptr(&compression_buffer), - buffer_len(&compression_buffer)); + buffer_len(&compression_buffer)); } /* Compute packet length without padding (add checksum, remove padding). */ len = buffer_len(&outgoing_packet) + 4 - 8; /* Insert padding. Initialized to zero in packet_start1() */ padding = 8 - len % 8; - if (!send_context.plaintext) { + if (send_context.cipher->number != SSH_CIPHER_NONE) { cp = buffer_ptr(&outgoing_packet); for (i = 0; i < padding; i++) { if (i % 4 == 0) @@ -497,7 +397,7 @@ buffer_consume(&outgoing_packet, 8 - padding); /* Add check bytes. */ - checksum = ssh_crc32(buffer_ptr(&outgoing_packet), + checksum = ssh_crc32((u_char *) buffer_ptr(&outgoing_packet), buffer_len(&outgoing_packet)); PUT_32BIT(buf, checksum); buffer_append(&outgoing_packet, buf, 4); @@ -510,9 +410,9 @@ /* Append to output. */ PUT_32BIT(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), - buffer_len(&outgoing_packet)); + buffer_append_space(&output, &cp, buffer_len(&outgoing_packet)); + cipher_encrypt(&send_context, cp, buffer_ptr(&outgoing_packet), + buffer_len(&outgoing_packet)); #ifdef PACKET_DEBUG fprintf(stderr, "encrypted: "); @@ -535,20 +435,14 @@ Mac *mac; Comp *comp; CipherContext *cc; - int encrypt; debug("newkeys: mode %d", mode); - if (mode == MODE_OUT) { - cc = &send_context; - encrypt = CIPHER_ENCRYPT; - } else { - cc = &receive_context; - encrypt = CIPHER_DECRYPT; - } + cc = (mode == MODE_OUT) ? &send_context : &receive_context; if (newkeys[mode] != NULL) { debug("newkeys: rekeying"); - cipher_cleanup(cc); + /* todo: free old keys, reset compression/cipher-ctxt; */ + memset(cc, 0, sizeof(*cc)); enc = &newkeys[mode]->enc; mac = &newkeys[mode]->mac; comp = &newkeys[mode]->comp; @@ -570,11 +464,10 @@ if (mac->md != NULL) mac->enabled = 1; DBG(debug("cipher_init_context: %d", mode)); - cipher_init(cc, enc->cipher, enc->key, enc->key_len, - enc->iv, enc->block_size, encrypt); - /* Deleting the keys does not gain extra security */ - /* memset(enc->iv, 0, enc->block_size); - memset(enc->key, 0, enc->key_len); */ + cipher_init(cc, enc->cipher, enc->key, enc->cipher->key_len, + enc->iv, enc->cipher->block_size); + memset(enc->iv, 0, enc->cipher->block_size); + memset(enc->key, 0, enc->cipher->key_len); if (comp->type != 0 && comp->enabled == 0) { packet_init_compression(); if (mode == MODE_OUT) @@ -588,13 +481,14 @@ /* * Finalize packet in SSH2 format (compress, mac, encrypt, enqueue) */ -static void +void packet_send2(void) { - u_char type, *cp, *macbuf = NULL; - u_char padlen, pad; + static u_int32_t seqnr = 0; + u_char type, *ucp, *macbuf = NULL; + char *cp; u_int packet_length = 0; - u_int i, len; + u_int i, padlen, len; u_int32_t rand = 0; Enc *enc = NULL; Mac *mac = NULL; @@ -606,10 +500,10 @@ mac = &newkeys[MODE_OUT]->mac; comp = &newkeys[MODE_OUT]->comp; } - block_size = enc ? enc->block_size : 8; + block_size = enc ? enc->cipher->block_size : 8; - cp = buffer_ptr(&outgoing_packet); - type = cp[5]; + ucp = (u_char *) buffer_ptr(&outgoing_packet); + type = ucp[5]; #ifdef PACKET_DEBUG fprintf(stderr, "plain: "); @@ -640,17 +534,8 @@ padlen = block_size - (len % block_size); if (padlen < 4) padlen += block_size; - if (extra_pad) { - /* will wrap if extra_pad+padlen > 255 */ - extra_pad = roundup(extra_pad, block_size); - pad = extra_pad - ((len + padlen) % extra_pad); - debug3("packet_send2: adding %d (len %d padlen %d extra_pad %d)", - pad, len, padlen, extra_pad); - padlen += pad; - extra_pad = 0; - } - cp = buffer_append_space(&outgoing_packet, padlen); - if (enc && !send_context.plaintext) { + buffer_append_space(&outgoing_packet, &cp, padlen); + if (enc && enc->cipher->number != SSH_CIPHER_NONE) { /* random padding */ for (i = 0; i < padlen; i++) { if (i % 4 == 0) @@ -664,21 +549,21 @@ } /* 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); - cp[4] = padlen; + ucp = (u_char *)buffer_ptr(&outgoing_packet); + PUT_32BIT(ucp, packet_length); + ucp[4] = padlen; DBG(debug("send: len %d (includes padlen %d)", packet_length+4, padlen)); /* compute MAC over seqnr and packet(length fields, payload, padding) */ if (mac && mac->enabled) { - macbuf = mac_compute(mac, send_seqnr, - buffer_ptr(&outgoing_packet), + macbuf = mac_compute(mac, seqnr, + (u_char *) buffer_ptr(&outgoing_packet), buffer_len(&outgoing_packet)); - DBG(debug("done calc MAC out #%d", send_seqnr)); + DBG(debug("done calc MAC out #%d", seqnr)); } /* encrypt packet and append to output buffer. */ - cp = buffer_append_space(&output, buffer_len(&outgoing_packet)); - cipher_crypt(&send_context, cp, buffer_ptr(&outgoing_packet), + buffer_append_space(&output, &cp, buffer_len(&outgoing_packet)); + cipher_encrypt(&send_context, cp, buffer_ptr(&outgoing_packet), buffer_len(&outgoing_packet)); /* append unencrypted MAC */ if (mac && mac->enabled) @@ -688,7 +573,7 @@ buffer_dump(&output); #endif /* increment sequence number for outgoing packets */ - if (++send_seqnr == 0) + if (++seqnr == 0) log("outgoing seqnr wraps around"); buffer_clear(&outgoing_packet); @@ -697,7 +582,7 @@ } void -packet_send(void) +packet_send() { if (compat20) packet_send2(); @@ -713,7 +598,7 @@ */ int -packet_read_seqnr(u_int32_t *seqnr_p) +packet_read(int *payload_len_ptr) { int type, len; fd_set *setp; @@ -729,13 +614,13 @@ /* Stay in the loop until we have received a complete packet. */ for (;;) { /* Try to read a packet from the buffer. */ - type = packet_read_poll_seqnr(seqnr_p); + type = packet_read_poll(payload_len_ptr); if (!compat20 && ( type == SSH_SMSG_SUCCESS || type == SSH_SMSG_FAILURE || type == SSH_CMSG_EOF || type == SSH_CMSG_EXIT_CONFIRMATION)) - packet_check_eom(); + packet_integrity_check(*payload_len_ptr, 0, type); /* If we got a packet, return it. */ if (type != SSH_MSG_NONE) { xfree(setp); @@ -768,23 +653,17 @@ /* NOTREACHED */ } -int -packet_read(void) -{ - return packet_read_seqnr(NULL); -} - /* * Waits until a packet has been received, verifies that its type matches * that given, and gives a fatal error and exits if there is a mismatch. */ void -packet_read_expect(int expected_type) +packet_read_expect(int *payload_len_ptr, int expected_type) { int type; - type = packet_read(); + type = packet_read(payload_len_ptr); if (type != expected_type) packet_disconnect("Protocol error: expected packet type %d, got %d", expected_type, type); @@ -797,21 +676,28 @@ * SSH_MSG_DISCONNECT is handled specially here. Also, * SSH_MSG_IGNORE messages are skipped by this function and are never returned * to higher levels. + * + * The returned payload_len does include space consumed by: + * Packet length + * Padding + * Packet type + * Check bytes */ -static int -packet_read_poll1(void) +int +packet_read_poll1(int *payload_len_ptr) { u_int len, padded_len; - u_char *cp, type; + u_char *ucp, type; + char *cp; u_int checksum, stored_checksum; /* Check if input size is less than minimum packet size. */ if (buffer_len(&input) < 4 + 8) return SSH_MSG_NONE; /* Get length of incoming packet. */ - cp = buffer_ptr(&input); - len = GET_32BIT(cp); + ucp = (u_char *) buffer_ptr(&input); + len = GET_32BIT(ucp); if (len < 1 + 2 + 2 || len > 256 * 1024) packet_disconnect("Bad packet length %d.", len); padded_len = (len + 8) & ~7; @@ -830,14 +716,14 @@ * (C)1998 CORE-SDI, Buenos Aires Argentina * Ariel Futoransky(futo@core-sdi.com) */ - if (!receive_context.plaintext && + if (receive_context.cipher->number != SSH_CIPHER_NONE && detect_attack(buffer_ptr(&input), padded_len, NULL) == DEATTACK_DETECTED) packet_disconnect("crc32 compensation attack: network attack detected"); /* Decrypt data to incoming_packet. */ buffer_clear(&incoming_packet); - cp = buffer_append_space(&incoming_packet, padded_len); - cipher_crypt(&receive_context, cp, buffer_ptr(&input), padded_len); + buffer_append_space(&incoming_packet, &cp, padded_len); + cipher_decrypt(&receive_context, cp, buffer_ptr(&input), padded_len); buffer_consume(&input, padded_len); @@ -847,7 +733,7 @@ #endif /* Compute packet checksum. */ - checksum = ssh_crc32(buffer_ptr(&incoming_packet), + checksum = ssh_crc32((u_char *) buffer_ptr(&incoming_packet), buffer_len(&incoming_packet) - 4); /* Skip padding. */ @@ -855,11 +741,11 @@ /* Test check bytes. */ if (len != buffer_len(&incoming_packet)) - packet_disconnect("packet_read_poll1: len %d != buffer_len %d.", + packet_disconnect("packet_read_poll: len %d != buffer_len %d.", len, buffer_len(&incoming_packet)); - cp = (u_char *)buffer_ptr(&incoming_packet) + len - 4; - stored_checksum = GET_32BIT(cp); + ucp = (u_char *) buffer_ptr(&incoming_packet) + len - 4; + stored_checksum = GET_32BIT(ucp); if (checksum != stored_checksum) packet_disconnect("Corrupted check bytes on input."); buffer_consume_end(&incoming_packet, 4); @@ -872,15 +758,18 @@ buffer_len(&compression_buffer)); } type = buffer_get_char(&incoming_packet); + *payload_len_ptr = buffer_len(&incoming_packet); return type; } -static int -packet_read_poll2(u_int32_t *seqnr_p) +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 *macbuf, *cp, type; + u_char *macbuf, *ucp, type; + char *cp; int maclen, block_size; Enc *enc = NULL; Mac *mac = NULL; @@ -892,7 +781,7 @@ comp = &newkeys[MODE_IN]->comp; } maclen = mac && mac->enabled ? mac->mac_len : 0; - block_size = enc ? enc->block_size : 8; + block_size = enc ? enc->cipher->block_size : 8; if (packet_length == 0) { /* @@ -902,11 +791,11 @@ if (buffer_len(&input) < block_size) return SSH_MSG_NONE; buffer_clear(&incoming_packet); - cp = buffer_append_space(&incoming_packet, block_size); - cipher_crypt(&receive_context, cp, buffer_ptr(&input), + buffer_append_space(&incoming_packet, &cp, block_size); + cipher_decrypt(&receive_context, cp, buffer_ptr(&input), block_size); - cp = buffer_ptr(&incoming_packet); - packet_length = GET_32BIT(cp); + ucp = (u_char *) buffer_ptr(&incoming_packet); + packet_length = GET_32BIT(ucp); if (packet_length < 1 + 4 || packet_length > 256 * 1024) { buffer_dump(&incoming_packet); packet_disconnect("Bad packet length %d.", packet_length); @@ -931,30 +820,28 @@ fprintf(stderr, "read_poll enc/full: "); buffer_dump(&input); #endif - cp = buffer_append_space(&incoming_packet, need); - cipher_crypt(&receive_context, cp, buffer_ptr(&input), need); + buffer_append_space(&incoming_packet, &cp, need); + cipher_decrypt(&receive_context, cp, buffer_ptr(&input), need); buffer_consume(&input, need); /* * compute MAC over seqnr and packet, * increment sequence number for incoming packet */ if (mac && mac->enabled) { - macbuf = mac_compute(mac, read_seqnr, - buffer_ptr(&incoming_packet), + macbuf = mac_compute(mac, seqnr, + (u_char *) buffer_ptr(&incoming_packet), buffer_len(&incoming_packet)); if (memcmp(macbuf, buffer_ptr(&input), mac->mac_len) != 0) packet_disconnect("Corrupted MAC on input."); - DBG(debug("MAC #%d ok", read_seqnr)); + DBG(debug("MAC #%d ok", seqnr)); buffer_consume(&input, mac->mac_len); } - if (seqnr_p != NULL) - *seqnr_p = read_seqnr; - if (++read_seqnr == 0) + if (++seqnr == 0) log("incoming seqnr wraps around"); /* get padlen */ - cp = buffer_ptr(&incoming_packet); - padlen = cp[4]; + cp = buffer_ptr(&incoming_packet) + 4; + padlen = (u_char) *cp; DBG(debug("input: padlen %d", padlen)); if (padlen < 4) packet_disconnect("Corrupted padlen %d on input.", padlen); @@ -979,6 +866,7 @@ type = buffer_get_char(&incoming_packet); if (type == SSH2_MSG_NEWKEYS) set_newkeys(MODE_IN); + *payload_len_ptr = buffer_len(&incoming_packet); #ifdef PACKET_DEBUG fprintf(stderr, "read/plain[%d]:\r\n", type); buffer_dump(&incoming_packet); @@ -989,18 +877,18 @@ } int -packet_read_poll_seqnr(u_int32_t *seqnr_p) +packet_read_poll(int *payload_len_ptr) { - int reason, seqnr; + int reason; u_char type; char *msg; for (;;) { if (compat20) { - type = packet_read_poll2(seqnr_p); + type = packet_read_poll2(payload_len_ptr); if (type) DBG(debug("received packet type %d", type)); - switch (type) { + switch(type) { case SSH2_MSG_IGNORE: break; case SSH2_MSG_DEBUG: @@ -1019,17 +907,13 @@ xfree(msg); fatal_cleanup(); break; - case SSH2_MSG_UNIMPLEMENTED: - seqnr = packet_get_int(); - debug("Received SSH2_MSG_UNIMPLEMENTED for %d", seqnr); - break; default: return type; break; } } else { - type = packet_read_poll1(); - switch (type) { + type = packet_read_poll1(payload_len_ptr); + switch(type) { case SSH_MSG_IGNORE: break; case SSH_MSG_DEBUG: @@ -1054,12 +938,6 @@ } } -int -packet_read_poll(void) -{ - return packet_read_poll_seqnr(NULL); -} - /* * Buffers the given amount of input characters. This is intended to be used * together with packet_read_poll. @@ -1074,7 +952,7 @@ /* Returns a character from the packet. */ u_int -packet_get_char(void) +packet_get_char() { char ch; buffer_get(&incoming_packet, &ch, 1); @@ -1084,7 +962,7 @@ /* Returns an integer from the packet data. */ u_int -packet_get_int(void) +packet_get_int() { return buffer_get_int(&incoming_packet); } @@ -1095,18 +973,18 @@ */ void -packet_get_bignum(BIGNUM * value) +packet_get_bignum(BIGNUM * value, int *length_ptr) { - buffer_get_bignum(&incoming_packet, value); + *length_ptr = buffer_get_bignum(&incoming_packet, value); } void -packet_get_bignum2(BIGNUM * value) +packet_get_bignum2(BIGNUM * value, int *length_ptr) { - buffer_get_bignum2(&incoming_packet, value); + *length_ptr = buffer_get_bignum2(&incoming_packet, value); } -void * +char * packet_get_raw(int *length_ptr) { int bytes = buffer_len(&incoming_packet); @@ -1128,7 +1006,7 @@ * integer into which the length of the string is stored. */ -void * +char * packet_get_string(u_int *length_ptr) { return buffer_get_string(&incoming_packet, length_ptr); @@ -1202,13 +1080,13 @@ packet_put_cstring(""); } else { packet_start(SSH_MSG_DISCONNECT); - packet_put_cstring(buf); + packet_put_string(buf, strlen(buf)); } packet_send(); packet_write_wait(); /* Stop listening for connections. */ - channel_close_all(); + channel_stop_listening(); /* Close the connection. */ packet_close(); @@ -1221,7 +1099,7 @@ /* Checks if there is any buffered output, and tries to write some of the output. */ void -packet_write_poll(void) +packet_write_poll() { int len = buffer_len(&output); if (len > 0) { @@ -1242,7 +1120,7 @@ */ void -packet_write_wait(void) +packet_write_wait() { fd_set *setp; @@ -1264,7 +1142,7 @@ /* Returns true if there is buffered data to write to the connection. */ int -packet_have_data_to_write(void) +packet_have_data_to_write() { return buffer_len(&output) != 0; } @@ -1272,7 +1150,7 @@ /* Returns true if there is not too much data to write to the connection. */ int -packet_not_very_much_data_to_write(void) +packet_not_very_much_data_to_write() { if (interactive_mode) return buffer_len(&output) < 16384; @@ -1288,6 +1166,7 @@ static int called = 0; int lowdelay = IPTOS_LOWDELAY; int throughput = IPTOS_THROUGHPUT; + int on = 1; if (called) return; @@ -1309,17 +1188,19 @@ */ if (packet_connection_is_ipv4()) { if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, - &lowdelay, sizeof(lowdelay)) < 0) + (void *) &lowdelay, sizeof(lowdelay)) < 0) error("setsockopt IPTOS_LOWDELAY: %.100s", strerror(errno)); } - set_nodelay(connection_in); + if (setsockopt(connection_in, IPPROTO_TCP, TCP_NODELAY, (void *) &on, + sizeof(on)) < 0) + error("setsockopt TCP_NODELAY: %.100s", strerror(errno)); } else if (packet_connection_is_ipv4()) { /* * Set IP options for a non-interactive connection. Use * IPTOS_THROUGHPUT. */ - if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, &throughput, + if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, (void *) &throughput, sizeof(throughput)) < 0) error("setsockopt IPTOS_THROUGHPUT: %.100s", strerror(errno)); } @@ -1328,7 +1209,7 @@ /* Returns true if the current connection is interactive. */ int -packet_is_interactive(void) +packet_is_interactive() { return interactive_mode; } @@ -1346,19 +1227,11 @@ log("packet_set_maxsize: bad size %d", s); return -1; } - called = 1; - debug("packet_set_maxsize: setting to %d", s); + log("packet_set_maxsize: setting to %d", s); max_packet_size = s; return s; } -/* roundup current message to pad bytes */ -void -packet_add_padding(u_char pad) -{ - extra_pad = pad; -} - /* * 9.2. Ignored Data Message * @@ -1370,7 +1243,42 @@ * required to send them. This message can be used as an additional * protection measure against advanced traffic analysis techniques. */ +/* size of current + ignore message should be n*sumlen bytes (w/o mac) */ void +packet_inject_ignore(int sumlen) +{ + int blocksize, padlen, have, need, nb, mini, nbytes; + Enc *enc = NULL; + + if (compat20 == 0) + return; + + have = buffer_len(&outgoing_packet); + debug2("packet_inject_ignore: current %d", have); + if (newkeys[MODE_OUT] != NULL) + enc = &newkeys[MODE_OUT]->enc; + blocksize = enc ? enc->cipher->block_size : 8; + padlen = blocksize - (have % blocksize); + if (padlen < 4) + padlen += blocksize; + have += padlen; + have /= blocksize; /* # of blocks for current message */ + + nb = roundup(sumlen, blocksize) / blocksize; /* blocks for both */ + mini = roundup(5+1+4+4, blocksize) / blocksize; /* minsize ignore msg */ + need = nb - (have % nb); /* blocks for ignore */ + if (need <= mini) + need += nb; + nbytes = (need - mini) * blocksize; /* size of ignore payload */ + debug2("packet_inject_ignore: block %d have %d nb %d mini %d need %d", + blocksize, have, nb, mini, need); + + /* enqueue current message and append a ignore message */ + packet_send(); + packet_send_ignore(nbytes); +} + +void packet_send_ignore(int nbytes) { u_int32_t rand = 0; @@ -1378,7 +1286,7 @@ packet_start(compat20 ? SSH2_MSG_IGNORE : SSH_MSG_IGNORE); packet_put_int(nbytes); - for (i = 0; i < nbytes; i++) { + for(i = 0; i < nbytes; i++) { if (i % 4 == 0) rand = arc4random(); packet_put_char(rand & 0xff);