Enabling CNG back after merging L1 to master.
This commit is contained in:
parent
7f97b8188a
commit
d7986de876
|
@ -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 ansiprsr.o \
|
||||
stringhelp.o deskright.o win32auth.o kerberos.o cng_cipher.o ansiprsr.o \
|
||||
console.o tnnet.o conio.o tncon.o
|
||||
|
||||
WIN32COMPATLIB=@LIBWIN32COMPAT@
|
||||
|
@ -45,6 +45,6 @@ distclean: clean
|
|||
|
||||
$(WIN32COMPATFILES): ../../../config.h
|
||||
|
||||
$(WIN32COMPATLIB): $(WIN32COMPATFILES)
|
||||
$(AR) rv $@ $(WIN32COMPATFILES)
|
||||
$(WIN32COMPATLIB): $(WIN32COMPATFILES) $(CNGFILES)
|
||||
$(AR) rv $@ $(WIN32COMPATFILES) $(CNGFILES)
|
||||
$(RANLIB) $@
|
||||
|
|
|
@ -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-openssl.o digest-libc.o hmac.o \
|
||||
ssh-ed25519.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 \
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue