From 35dabd0398dc4aa8735d5ec896ead6955b83b2ff Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 1 May 2000 21:10:33 +1000 Subject: [scp.c] - fix very rare EAGAIN/EINTR issues; based on work by djm [packet.c] - less debug, rm unused [auth2.c] - disable kerb,s/key in ssh2 [sshd.8] - Minor tweaks and typo fixes. [ssh-keygen.c] - Put -d into usage and reorder. markus ok. --- packet.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'packet.c') diff --git a/packet.c b/packet.c index 73a96b98..e70d0609 100644 --- a/packet.c +++ b/packet.c @@ -17,7 +17,7 @@ */ #include "includes.h" -RCSID("$Id: packet.c,v 1.20 2000/04/30 22:24:07 damien Exp $"); +RCSID("$Id: packet.c,v 1.21 2000/05/01 11:10:33 damien 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); -- cgit v1.2.3