From a30b61461e41411595cd6cedbc04ba3b02cb5ee0 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Mon, 11 Jun 2018 13:29:31 +0800 Subject: [PATCH] libssh: No need of compat vis.c as we support VIS_ALL This helps avoid the vis.o symbol conflicts between libc and libssh. --- lib/libssh/Makefile | 5 ++--- lib/libssh/config.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/libssh/Makefile b/lib/libssh/Makefile index b052c6714e..aef01a8995 100644 --- a/lib/libssh/Makefile +++ b/lib/libssh/Makefile @@ -30,9 +30,8 @@ SRCS+= authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c \ platform-pledge.c platform-tracing.c platform-misc.c # Portability layer SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c \ - getrrsetbyname.c glob.c openssl-compat.c \ - port-tun.c reallocarray.c realpath.c timingsafe_bcmp.c vis.c \ - recallocarray.c + getrrsetbyname.c glob.c openssl-compat.c port-tun.c \ + reallocarray.c realpath.c recallocarray.c timingsafe_bcmp.c # only when USE_BUILTIN_RIJNDAEL #SRCS+= cipher-aes.c diff --git a/lib/libssh/config.h b/lib/libssh/config.h index 43cee8f983..d573b0cfb7 100644 --- a/lib/libssh/config.h +++ b/lib/libssh/config.h @@ -77,7 +77,7 @@ /* #undef BROKEN_SNPRINTF */ /* missing VIS_ALL */ -#define BROKEN_STRNVIS 1 +/* #undef BROKEN_STRNVIS */ /* tcgetattr with ICANON may hang */ /* #undef BROKEN_TCGETATTR_ICANON */ -- 2.41.0