Skip to content

Commit 7f97b81

Browse files
committed
Disable CNG for MingW builid
1 parent 891836d commit 7f97b81

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

contrib/win32/win32compat/Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ LDFLAGS=-L. @LDFLAGS@ -L/lib/win32api
1919

2020
WIN32COMPATFILES = daemon.o gettimeofday.o homedirhelp.o pwd.o sfds.o \
2121
socket.o startupneeds.o strcasecmp.o syslog.o lsalogon.o lsastring.o \
22-
stringhelp.o deskright.o win32auth.o kerberos.o cng_cipher.o ansiprsr.o \
22+
stringhelp.o deskright.o win32auth.o kerberos.o ansiprsr.o \
2323
console.o tnnet.o conio.o tncon.o
2424

2525
WIN32COMPATLIB=@LIBWIN32COMPAT@
@@ -45,6 +45,6 @@ distclean: clean
4545

4646
$(WIN32COMPATFILES): ../../../config.h
4747

48-
$(WIN32COMPATLIB): $(WIN32COMPATFILES) $(CNGFILES)
49-
$(AR) rv $@ $(WIN32COMPATFILES) $(CNGFILES)
48+
$(WIN32COMPATLIB): $(WIN32COMPATFILES)
49+
$(AR) rv $@ $(WIN32COMPATFILES)
5050
$(RANLIB) $@

win32_Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
8787
msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
8888
ssh-pkcs11.o smult_curve25519_ref.o \
8989
poly1305.o chacha.o cipher-chachapoly.o \
90-
ssh-ed25519.o digest-libc.o hmac.o \
90+
ssh-ed25519.o digest-openssl.o digest-libc.o hmac.o \
9191
sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \
9292
kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
9393
kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \

win32_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1641,7 +1641,7 @@
16411641
#define HAVE_DECL_HOWMANY 0
16421642

16431643
#define WIN32_ZLIB_NO 1
1644-
#define USE_MSCNG 1
1644+
//#define USE_MSCNG 1
16451645

16461646
//#define HAVE_ARC4RANDOM_UNIFORM 1
16471647

win32_config.h.tail

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
#define HAVE_DECL_HOWMANY 0
100100

101101
#define WIN32_ZLIB_NO 1
102-
#define USE_MSCNG 1
102+
//#define USE_MSCNG 1
103103

104104
//#define HAVE_ARC4RANDOM_UNIFORM 1
105105

0 commit comments

Comments
 (0)