1 files changed, 11 insertions, 7 deletions

diff --git a/packet.h b/packet.h
index 0d25b352c..40837e9db 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.76 2017/02/03 23:03:33 djm Exp $ */
+/* $OpenBSD: packet.h,v 1.82 2017/09/12 06:32:07 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -77,6 +77,12 @@ struct ssh {
         TAILQ_HEAD(, key_entry) private_keys;
         TAILQ_HEAD(, key_entry) public_keys;
 
+        /* Client/Server authentication context */
+        void *authctxt;
+
+        /* Channels context */
+        struct ssh_channels *chanctxt;
+
         /* APP data */
         void *app_data;
 };
@@ -93,8 +99,9 @@ void     ssh_packet_set_nonblocking(struct ssh *);
 int      ssh_packet_get_connection_in(struct ssh *);
 int      ssh_packet_get_connection_out(struct ssh *);
 void     ssh_packet_close(struct ssh *);
-void     ssh_packet_set_encryption_key(struct ssh *, const u_char *, u_int, int);
 void     ssh_packet_set_input_hook(struct ssh *, ssh_packet_hook_fn *, void *);
+void     ssh_packet_clear_keys(struct ssh *);
+void     ssh_clear_newkeys(struct ssh *, int);
 
 int      ssh_packet_is_rekeying(struct ssh *);
 void     ssh_packet_set_protocol_flags(struct ssh *, u_int);
@@ -112,14 +119,12 @@ int	 ssh_packet_set_log_preamble(struct ssh *, const char *, ...)
 
 int      ssh_packet_log_type(u_char);
 
-int      ssh_packet_send1(struct ssh *);
 int      ssh_packet_send2_wrapped(struct ssh *);
 int      ssh_packet_send2(struct ssh *);
 
 int      ssh_packet_read(struct ssh *);
 int      ssh_packet_read_expect(struct ssh *, u_int type);
 int      ssh_packet_read_poll(struct ssh *);
-int ssh_packet_read_poll1(struct ssh *, u_char *);
 int ssh_packet_read_poll2(struct ssh *, u_char *, u_int32_t *seqnr_p);
 int      ssh_packet_process_incoming(struct ssh *, const char *buf, u_int len);
 int      ssh_packet_read_seqnr(struct ssh *, u_char *, u_int32_t *seqnr_p);
@@ -141,7 +146,6 @@ int      ssh_packet_not_very_much_data_to_write(struct ssh *);
 
 int      ssh_packet_connection_is_on_socket(struct ssh *);
 int      ssh_packet_remaining(struct ssh *);
-void     ssh_packet_send_ignore(struct ssh *, int);
 
 void     tty_make_modes(int, struct termios *);
 void     tty_parse_modes(int, int *);
@@ -172,6 +176,7 @@ int     sshpkt_disconnect(struct ssh *, const char *fmt, ...)
             __attribute__((format(printf, 2, 3)));
 int     sshpkt_add_padding(struct ssh *, u_char);
 void    sshpkt_fatal(struct ssh *ssh, const char *tag, int r);
+int     sshpkt_msg_ignore(struct ssh *, u_int);
 
 int     sshpkt_put(struct ssh *ssh, const void *v, size_t len);
 int     sshpkt_putb(struct ssh *ssh, const struct sshbuf *b);
@@ -182,7 +187,6 @@ int	sshpkt_put_string(struct ssh *ssh, const void *v, size_t len);
 int     sshpkt_put_cstring(struct ssh *ssh, const void *v);
 int     sshpkt_put_stringb(struct ssh *ssh, const struct sshbuf *v);
 int     sshpkt_put_ec(struct ssh *ssh, const EC_POINT *v, const EC_GROUP *g);
-int     sshpkt_put_bignum1(struct ssh *ssh, const BIGNUM *v);
 int     sshpkt_put_bignum2(struct ssh *ssh, const BIGNUM *v);
 
 int     sshpkt_get(struct ssh *ssh, void *valp, size_t len);
@@ -191,9 +195,9 @@ int	sshpkt_get_u32(struct ssh *ssh, u_int32_t *valp);
 int     sshpkt_get_u64(struct ssh *ssh, u_int64_t *valp);
 int     sshpkt_get_string(struct ssh *ssh, u_char **valp, size_t *lenp);
 int     sshpkt_get_string_direct(struct ssh *ssh, const u_char **valp, size_t *lenp);
+int     sshpkt_peek_string_direct(struct ssh *ssh, const u_char **valp, size_t *lenp);
 int     sshpkt_get_cstring(struct ssh *ssh, char **valp, size_t *lenp);
 int     sshpkt_get_ec(struct ssh *ssh, EC_POINT *v, const EC_GROUP *g);
-int     sshpkt_get_bignum1(struct ssh *ssh, BIGNUM *v);
 int     sshpkt_get_bignum2(struct ssh *ssh, BIGNUM *v);
 int     sshpkt_get_end(struct ssh *ssh);
 const u_char    *sshpkt_ptr(struct ssh *, size_t *lenp);