- (djm) RCSID sync w/ OpenBSD

[openssh.git] / packet.h

diff --git a/packet.h b/packet.h
index dcf2a664f3a9cca33b74e2a359924e0db4edfc13..fa000d6864feea4bd37078a497cbf3786289f162 100644 (file)
--- a/packet.h
+++ b/packet.h
@@ -1,3 +1,5 @@
+/*     $OpenBSD: packet.h,v 1.39 2003/04/08 20:21:29 itojun Exp $      */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: packet.h,v 1.31 2001/12/28 13:57:33 markus Exp $"); */
-
 #ifndef PACKET_H
 #define PACKET_H
 
@@ -24,6 +24,7 @@ int      packet_get_connection_in(void);
 int      packet_get_connection_out(void);
 void     packet_close(void);
 void    packet_set_encryption_key(const u_char *, u_int, int);
+u_int   packet_get_encryption_key(u_char *);
 void     packet_set_protocol_flags(u_int);
 u_int   packet_get_protocol_flags(void);
 void     packet_start_compression(int);
@@ -40,12 +41,12 @@ void     packet_put_cstring(const char *str);
 void     packet_put_raw(const void *buf, u_int len);
 void     packet_send(void);
 
-int      packet_read(int *payload_len_ptr);
-void     packet_read_expect(int *payload_len_ptr, int type);
-int      packet_read_poll(int *packet_len_ptr);
+int      packet_read(void);
+void     packet_read_expect(int type);
+int      packet_read_poll(void);
 void     packet_process_incoming(const char *buf, u_int len);
-int      packet_read_seqnr(int *payload_len_ptr, u_int32_t *seqnr_p);
-int      packet_read_poll_seqnr(int *packet_len_ptr, u_int32_t *seqnr_p);
+int      packet_read_seqnr(u_int32_t *seqnr_p);
+int      packet_read_poll_seqnr(u_int32_t *seqnr_p);
 
 u_int   packet_get_char(void);
 u_int   packet_get_int(void);
@@ -56,6 +57,16 @@ void *packet_get_string(u_int *length_ptr);
 void     packet_disconnect(const char *fmt,...) __attribute__((format(printf, 1, 2)));
 void     packet_send_debug(const char *fmt,...) __attribute__((format(printf, 1, 2)));
 
+void    set_newkeys(int mode);
+int     packet_get_keyiv_len(int);
+void    packet_get_keyiv(int, u_char *, u_int);
+int     packet_get_keycontext(int, u_char *);
+void    packet_set_keycontext(int, u_char *);
+void    packet_get_state(int, u_int32_t *, u_int64_t *, u_int32_t *);
+void    packet_set_state(int, u_int32_t, u_int64_t, u_int32_t);
+int     packet_get_ssh1_cipher(void);
+void    packet_set_iv(int, u_char *);
+
 void     packet_write_poll(void);
 void     packet_write_wait(void);
 int      packet_have_data_to_write(void);
@@ -79,10 +90,13 @@ int      packet_set_maxsize(int);
 do { \
        int _len = packet_remaining(); \
        if (_len > 0) { \
-               log("Packet integrity error (%d bytes remaining) at %s:%d", \
+               logit("Packet integrity error (%d bytes remaining) at %s:%d", \
                    _len ,__FILE__, __LINE__); \
                packet_disconnect("Packet integrity error."); \
        } \
 } while (0)
 
+int     packet_need_rekeying(void);
+void    packet_set_rekey_limit(u_int32_t);
+
 #endif                         /* PACKET_H */