summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/packet.c b/packet.c
index 73a96b986..e70d06091 100644
--- a/packet.c
+++ b/packet.c
@@ -17,7 +17,7 @@
17 */ 17 */
18 18
19#include "includes.h" 19#include "includes.h"
20RCSID("$Id: packet.c,v 1.20 2000/04/30 22:24:07 damien Exp $"); 20RCSID("$Id: packet.c,v 1.21 2000/05/01 11:10:33 damien Exp $");
21 21
22#include "xmalloc.h" 22#include "xmalloc.h"
23#include "buffer.h" 23#include "buffer.h"
@@ -130,7 +130,7 @@ clear_enc_keys(Enc *enc, int len)
130void 130void
131packet_set_ssh2_format(void) 131packet_set_ssh2_format(void)
132{ 132{
133 debug("use_ssh2_packet_format"); 133 DBG(debug("use_ssh2_packet_format"));
134 use_ssh2_packet_format = 1; 134 use_ssh2_packet_format = 1;
135} 135}
136 136
@@ -613,7 +613,7 @@ packet_send2()
613 fatal("packet_send2: no KEX"); 613 fatal("packet_send2: no KEX");
614 if (mac->md != NULL) 614 if (mac->md != NULL)
615 mac->enabled = 1; 615 mac->enabled = 1;
616 debug("cipher_set_key_iv send_context"); 616 DBG(debug("cipher_set_key_iv send_context"));
617 cipher_set_key_iv(&send_context, enc->type, 617 cipher_set_key_iv(&send_context, enc->type,
618 enc->key, enc->key_len, 618 enc->key, enc->key_len,
619 enc->iv, enc->iv_len); 619 enc->iv, enc->iv_len);
@@ -636,13 +636,6 @@ packet_send()
636 DBG(debug("packet_send done")); 636 DBG(debug("packet_send done"));
637} 637}
638 638
639void
640packet_send_and_wait()
641{
642 packet_send();
643 packet_write_wait();
644}
645
646/* 639/*
647 * Waits until a packet has been received, and returns its type. Note that 640 * Waits until a packet has been received, and returns its type. Note that
648 * no other data is processed until this returns, so this function should not 641 * no other data is processed until this returns, so this function should not
@@ -921,7 +914,7 @@ packet_read_poll2(int *payload_len_ptr)
921 fatal("packet_read_poll2: no KEX"); 914 fatal("packet_read_poll2: no KEX");
922 if (mac->md != NULL) 915 if (mac->md != NULL)
923 mac->enabled = 1; 916 mac->enabled = 1;
924 debug("cipher_set_key_iv receive_context"); 917 DBG(debug("cipher_set_key_iv receive_context"));
925 cipher_set_key_iv(&receive_context, enc->type, 918 cipher_set_key_iv(&receive_context, enc->type,
926 enc->key, enc->key_len, 919 enc->key, enc->key_len,
927 enc->iv, enc->iv_len); 920 enc->iv, enc->iv_len);