update to http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.7p1-hpn13v1.diff.gz

[gssapi-openssh.git] / openssh / packet.h

diff --git a/openssh/packet.h b/openssh/packet.h
index 4fbfee350d4c05827e878fcc844b7d29558e2666..caf8c46f58083fc86f2bf3c4cd290cecfaeee191 100644 (file)
--- a/openssh/packet.h
+++ b/openssh/packet.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: packet.h,v 1.45 2006/03/25 22:22:43 djm Exp $ */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,54 +13,70 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: packet.h,v 1.26 2001/11/07 16:03:17 markus Exp $"); */
-
 #ifndef PACKET_H
 #define PACKET_H
 
+#include <termios.h>
+
 #include <openssl/bn.h>
 
+void
+packet_request_rekeying(void);
+
 void     packet_set_connection(int, int);
 void     packet_set_nonblocking(void);
 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);
 void     packet_set_interactive(int);
 int      packet_is_interactive(void);
+void     packet_set_server(void);
+void     packet_set_authenticated(void);
+int     packet_authentication_state(void);
 
 void     packet_start(u_char);
 void     packet_put_char(int ch);
 void     packet_put_int(u_int value);
 void     packet_put_bignum(BIGNUM * value);
 void     packet_put_bignum2(BIGNUM * value);
-void     packet_put_string(const char *buf, u_int len);
+void     packet_put_string(const void *buf, u_int len);
 void     packet_put_cstring(const char *str);
-void     packet_put_raw(const char *buf, u_int len);
-void     packet_send(void);
+void     packet_put_raw(const void *buf, u_int len);
+int      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(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);
-void     packet_get_bignum(BIGNUM * value, int *length_ptr);
-void     packet_get_bignum2(BIGNUM * value, int *length_ptr);
-char   *packet_get_raw(int *length_ptr);
-char    *packet_get_string(u_int *length_ptr);
-/*modified by binhe*/
-void packet_get_all(void);
-/*end of modification*/
+void     packet_get_bignum(BIGNUM * value);
+void     packet_get_bignum2(BIGNUM * value);
+void   *packet_get_raw(u_int *length_ptr);
+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     packet_write_poll(void);
-void     packet_write_wait(void);
+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 *);
+
+int      packet_write_poll(void);
+int      packet_write_wait(void);
 int      packet_have_data_to_write(void);
 int      packet_not_very_much_data_to_write(void);
 
@@ -71,28 +89,22 @@ void         packet_add_padding(u_char);
 void    tty_make_modes(int, struct termios *);
 void    tty_parse_modes(int, int *);
 
-extern int max_packet_size;
-int      packet_set_maxsize(int);
+extern u_int max_packet_size;
+int     packet_set_maxsize(u_int);
 #define  packet_get_maxsize() max_packet_size
 
-#define packet_integrity_check(payload_len, expected_len, type) \
-do { \
-       int _p = (payload_len), _e = (expected_len); \
-       if (_p != _e) { \
-               log("Packet integrity error (%d != %d) at %s:%d", \
-                   _p, _e, __FILE__, __LINE__); \
-               packet_disconnect("Packet integrity error. (%d)", (type)); \
-       } \
-} while (0)
-
-#define packet_done() \
+/* don't allow remaining bytes after the end of the message */
+#define packet_check_eom() \
 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 */