diff options
| -rw-r--r-- | usr.bin/ssh/packet.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index bc052646ae7..a3f761f7c81 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/packet.c @@ -17,7 +17,7 @@ */ #include "includes.h" -RCSID("$Id: packet.c,v 1.30 2000/04/30 09:12:07 markus Exp $"); +RCSID("$Id: packet.c,v 1.31 2000/05/01 07:40:03 markus Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -130,7 +130,7 @@ clear_enc_keys(Enc *enc, int len) void packet_set_ssh2_format(void) { - debug("use_ssh2_packet_format"); + DBG(debug("use_ssh2_packet_format")); use_ssh2_packet_format = 1; } @@ -613,7 +613,7 @@ packet_send2() fatal("packet_send2: no KEX"); if (mac->md != NULL) mac->enabled = 1; - debug("cipher_set_key_iv send_context"); + DBG(debug("cipher_set_key_iv send_context")); cipher_set_key_iv(&send_context, enc->type, enc->key, enc->key_len, enc->iv, enc->iv_len); @@ -636,13 +636,6 @@ packet_send() DBG(debug("packet_send done")); } -void -packet_send_and_wait() -{ - packet_send(); - packet_write_wait(); -} - /* * Waits until a packet has been received, and returns its type. Note that * no other data is processed until this returns, so this function should not @@ -921,7 +914,7 @@ packet_read_poll2(int *payload_len_ptr) fatal("packet_read_poll2: no KEX"); if (mac->md != NULL) mac->enabled = 1; - debug("cipher_set_key_iv receive_context"); + DBG(debug("cipher_set_key_iv receive_context")); cipher_set_key_iv(&receive_context, enc->type, enc->key, enc->key_len, enc->iv, enc->iv_len); |