2 files changed, 7 insertions, 3 deletions

diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c
index 7b58ea678..49e7b4d99 100644
--- a/openbsd-compat/port-tun.c
+++ b/openbsd-compat/port-tun.c
@@ -250,14 +250,18 @@ sys_tun_infilter(struct Channel *c, char *buf, int len)
 }
 
 u_char *
-sys_tun_outfilter(struct Channel *c, u_char **data, size_t *dlen)
+sys_tun_outfilter(struct Channel *c, u_char **data, u_int *dlen)
 {
         u_char *buf;
         u_int32_t *af;
         int r;
+        size_t xxx_dlen;
 
-        if ((r = sshbuf_get_string(&c->output, data, dlen)) != 0)
+        /* XXX new API is incompatible with this signature. */
+        if ((r = sshbuf_get_string(&c->output, data, &xxx_dlen)) != 0)
                 fatal("%s: buffer error: %s", __func__, ssh_err(r));
+        if (dlen != NULL)
+                *dlen = xxx_dlen;
         if (*dlen < sizeof(*af))
                 return (NULL);
         buf = *data;
diff --git a/openbsd-compat/port-tun.h b/openbsd-compat/port-tun.h
index e608a454d..c53df01fc 100644
--- a/openbsd-compat/port-tun.h
+++ b/openbsd-compat/port-tun.h
@@ -27,7 +27,7 @@ int	  sys_tun_open(int, int);
 #if defined(SSH_TUN_COMPAT_AF) || defined(SSH_TUN_PREPEND_AF)
 # define SSH_TUN_FILTER
 int      sys_tun_infilter(struct Channel *, char *, int);
-u_char  *sys_tun_outfilter(struct Channel *, u_char **, size_t *);
+u_char  *sys_tun_outfilter(struct Channel *, u_char **, u_int *);
 #endif
 
 #endif