From 9f7a0de0e4f91c858fe6d95f51ece47a924359c5 Mon Sep 17 00:00:00 2001 From: valenok Date: Thu, 21 Jul 2011 21:50:18 +0100 Subject: [PATCH] Adopt to cyassl-2.0.0rc2 --- Makefile | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 490199dd..56c4694c 100644 --- a/Makefile +++ b/Makefile @@ -65,37 +65,45 @@ CL= cl /MD /TC /nologo $(DBG) /Gz /W3 /DNO_SSL_DL GUILIB= user32.lib shell32.lib LINK= /link /incremental:no /libpath:$(VC)\lib /subsystem:windows \ ws2_32.lib advapi32.lib cyassl.lib - -CYAFL= /c /I $(CYA)\ctaocrypt\include /I $(CYA)\include /D_LIB +CYAFL = /c /I $(CYA)/include -I $(CYA)/include/openssl \ + /I $(CYA)/ctaocrypt/include /D _LIB /D OPENSSL_EXTRA CYASRC= $(CYA)/src/cyassl_int.c \ $(CYA)/src/cyassl_io.c \ $(CYA)/src/keys.c \ $(CYA)/src/tls.c \ + $(CYA)/src/ssl.c \ $(CYA)/ctaocrypt/src/aes.c \ $(CYA)/ctaocrypt/src/arc4.c \ $(CYA)/ctaocrypt/src/asn.c \ + $(CYA)/ctaocrypt/src/coding.c \ + $(CYA)/ctaocrypt/src/ctc_asm.c \ + $(CYA)/ctaocrypt/src/ctc_misc.c \ + $(CYA)/ctaocrypt/src/cyassl_memory.c \ $(CYA)/ctaocrypt/src/des3.c \ $(CYA)/ctaocrypt/src/dh.c \ $(CYA)/ctaocrypt/src/dsa.c \ + $(CYA)/ctaocrypt/src/ecc.c \ $(CYA)/ctaocrypt/src/hc128.c \ $(CYA)/ctaocrypt/src/hmac.c \ $(CYA)/ctaocrypt/src/integer.c \ $(CYA)/ctaocrypt/src/md4.c \ $(CYA)/ctaocrypt/src/md5.c \ - $(CYA)/ctaocrypt/src/misc.c \ + $(CYA)/ctaocrypt/src/pwdbased.c \ $(CYA)/ctaocrypt/src/rabbit.c \ $(CYA)/ctaocrypt/src/random.c \ $(CYA)/ctaocrypt/src/ripemd.c \ $(CYA)/ctaocrypt/src/rsa.c \ $(CYA)/ctaocrypt/src/sha.c \ - $(CYA)/ctaocrypt/src/sha256.c + $(CYA)/ctaocrypt/src/sha256.c \ + $(CYA)/ctaocrypt/src/sha512.c \ + $(CYA)/ctaocrypt/src/tfm.c cyassl: - $(CL) $(CYA)/src/ssl.c $(CYA)/ctaocrypt/src/coding.c \ - $(CYAFL) /DOPENSSL_EXTRA - $(CL) $(CYASRC) $(CYAFL) + $(CL) $(CYASRC) $(CYAFL) $(DEF) lib *.obj /out:cyassl.lib +# $(CL) $(CYA)/src/ssl.c $(CYA)/ctaocrypt/src/coding.c \ +# $(CYAFL) $(DEF) windows: rc win32\res.rc