upstream commit

support UTF-8 characters in ssh(1) banners using
schwarze@'s safe fmprintf printer; bz#2058

feedback schwarze@ ok dtucker@

Upstream-ID: a72ce4e3644c957643c9524eea2959e41b91eea7

1 files changed, 8 insertions, 13 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index 3d3c7bf42..6742a318c 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.245 2016/05/24 04:43:45 dtucker Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.246 2016/07/17 04:20:16 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -71,6 +71,7 @@
 #include "uidswap.h"
 #include "hostfile.h"
 #include "ssherr.h"
+#include "utf8.h"
 
 #ifdef GSSAPI
 #include "ssh-gss.h"
@@ -495,21 +496,15 @@ input_userauth_error(int type, u_int32_t seq, void *ctxt)
 int
 input_userauth_banner(int type, u_int32_t seq, void *ctxt)
 {
-        char *msg, *raw, *lang;
+        char *msg, *lang;
         u_int len;
 
-        debug3("input_userauth_banner");
-        raw = packet_get_string(&len);
+        debug3("%s", __func__);
+        msg = packet_get_string(&len);
         lang = packet_get_string(NULL);
-        if (len > 0 && options.log_level >= SYSLOG_LEVEL_INFO) {
-                if (len > 65536)
-                        len = 65536;
-                msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
-                strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL|VIS_NOSLASH);
-                fprintf(stderr, "%s", msg);
-                free(msg);
-        }
-        free(raw);
+        if (len > 0 && options.log_level >= SYSLOG_LEVEL_INFO)
+                fmprintf(stderr, "%s", msg);
+        free(msg);
         free(lang);
         return 0;
 }