1 files changed, 5 insertions, 7 deletions

diff --git a/packet.h b/packet.h
index 170203cab..0dfa36da1 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.86 2018/07/09 21:20:26 markus Exp $ */
+/* $OpenBSD: packet.h,v 1.90 2019/01/21 10:35:09 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -176,7 +176,8 @@ int	sshpkt_send(struct ssh *ssh);
 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);
+void    sshpkt_fatal(struct ssh *ssh, int r, const char *fmt, ...)
+            __attribute__((format(printf, 3, 4)));
 int     sshpkt_msg_ignore(struct ssh *, u_int);
 
 int     sshpkt_put(struct ssh *ssh, const void *v, size_t len);
@@ -198,16 +199,13 @@ 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_getb_froms(struct ssh *ssh, struct sshbuf **valp);
 int     sshpkt_get_ec(struct ssh *ssh, EC_POINT *v, const EC_GROUP *g);
-int     sshpkt_get_bignum2(struct ssh *ssh, BIGNUM *v);
+int     sshpkt_get_bignum2(struct ssh *ssh, BIGNUM **valp);
 int     sshpkt_get_end(struct ssh *ssh);
 void    sshpkt_fmt_connection_id(struct ssh *ssh, char *s, size_t l);
 const u_char    *sshpkt_ptr(struct ssh *, size_t *lenp);
 
-/* OLD API */
-extern struct ssh *active_state;
-#include "opacket.h"
-
 #if !defined(WITH_OPENSSL)
 # undef BIGNUM
 # undef EC_KEY