On 20/08/2018 19:14, Ingo Schwarze wrote:
> Index: utf8.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/ssh/utf8.c,v
> retrieving revision 1.7
> diff -u -p -r1.7 utf8.c
> --- utf8.c 31 May 2017 09:15:42 -0000 1.7
> +++ utf8.c 20 Aug 2018 17:11:33 -0000
> @@ -51,9 +51,18 @@ dangerous_locale(void) {
> char *loc;
>
> loc = nl_langinfo(CODESET);
> - return strcmp(loc, "US-ASCII") != 0 && strcmp(loc, "UTF-8") != 0 &&
> - strcmp(loc, "ANSI_X3.4-1968") != 0 && strcmp(loc, "646") != 0 &&
> - strcmp(loc, "") != 0;
> + return strcmp(loc, "UTF-8") != 0 &&
> + strcmp(loc, "US-ASCII") != 0 &&
> +
> + /*
> + * What nl_langinfo(CODESET) returns for US-ASCII
> + * on various operating systems:
> + */
> +
> + strcmp(loc, "ANSI_X3.4-1968") != 0 && /* Linux */
> + strcmp(loc, "ISO8859-1") != 0 && /* AIX */
> + strcmp(loc, "646") != 0 && /* Solaris, NetBSD */
> + strcmp(loc, "") != 0; /* Solaris 6 */
> }
>
> static int
After applying the patch:
root@x064:[/data/prj/openbsd/mindrot/openssh-7.8.0.20]/data/prj/openbsd/mindrot/openssh-7.8.0.20/regress/unittests/utf8/test_utf8
test_utf8: .................................. 34 tests ok
August 20th snapshot patched, not the -r 1.7
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ openssh-unix-dev mailing list openssh-unix-dev@xxxxxxxxxxx https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev
