From 7f97b8188a33b239daff6f549695588a41a12629 Mon Sep 17 00:00:00 2001 From: Manoj Ampalam Date: Sun, 8 Nov 2015 23:49:18 -0800 Subject: [PATCH] Disable CNG for MingW builid --- contrib/win32/win32compat/Makefile.in | 6 +++--- win32_Makefile.in | 2 +- win32_config.h | 2 +- win32_config.h.tail | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/win32/win32compat/Makefile.in b/contrib/win32/win32compat/Makefile.in index 78de177..293ef73 100644 --- a/contrib/win32/win32compat/Makefile.in +++ b/contrib/win32/win32compat/Makefile.in @@ -19,7 +19,7 @@ LDFLAGS=-L. @LDFLAGS@ -L/lib/win32api WIN32COMPATFILES = daemon.o gettimeofday.o homedirhelp.o pwd.o sfds.o \ socket.o startupneeds.o strcasecmp.o syslog.o lsalogon.o lsastring.o \ - stringhelp.o deskright.o win32auth.o kerberos.o cng_cipher.o ansiprsr.o \ + stringhelp.o deskright.o win32auth.o kerberos.o ansiprsr.o \ console.o tnnet.o conio.o tncon.o WIN32COMPATLIB=@LIBWIN32COMPAT@ @@ -45,6 +45,6 @@ distclean: clean $(WIN32COMPATFILES): ../../../config.h -$(WIN32COMPATLIB): $(WIN32COMPATFILES) $(CNGFILES) - $(AR) rv $@ $(WIN32COMPATFILES) $(CNGFILES) +$(WIN32COMPATLIB): $(WIN32COMPATFILES) + $(AR) rv $@ $(WIN32COMPATFILES) $(RANLIB) $@ diff --git a/win32_Makefile.in b/win32_Makefile.in index 277f4c3..7db8384 100644 --- a/win32_Makefile.in +++ b/win32_Makefile.in @@ -87,7 +87,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ ssh-pkcs11.o smult_curve25519_ref.o \ poly1305.o chacha.o cipher-chachapoly.o \ - ssh-ed25519.o digest-libc.o hmac.o \ + ssh-ed25519.o digest-openssl.o digest-libc.o hmac.o \ sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \ kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \ diff --git a/win32_config.h b/win32_config.h index 6263001..1cb7fc4 100644 --- a/win32_config.h +++ b/win32_config.h @@ -1641,7 +1641,7 @@ #define HAVE_DECL_HOWMANY 0 #define WIN32_ZLIB_NO 1 -#define USE_MSCNG 1 +//#define USE_MSCNG 1 //#define HAVE_ARC4RANDOM_UNIFORM 1 diff --git a/win32_config.h.tail b/win32_config.h.tail index 5336f54..f2dbd91 100644 --- a/win32_config.h.tail +++ b/win32_config.h.tail @@ -99,7 +99,7 @@ #define HAVE_DECL_HOWMANY 0 #define WIN32_ZLIB_NO 1 -#define USE_MSCNG 1 +//#define USE_MSCNG 1 //#define HAVE_ARC4RANDOM_UNIFORM 1