From 67326634496ef21b4acbf4cef2f05040d34aef9b Mon Sep 17 00:00:00 2001 From: marha <marha@users.sourceforge.net> Date: Tue, 10 Apr 2012 11:41:26 +0200 Subject: Update to openssl-1.0.1 --- openssl/ms/do_win64a.bat | 28 +++++++++++++++++++--------- openssl/ms/do_win64i.bat | 18 +++++++++--------- openssl/ms/uplink.h | 4 ++-- 3 files changed, 30 insertions(+), 20 deletions(-) (limited to 'openssl/ms') diff --git a/openssl/ms/do_win64a.bat b/openssl/ms/do_win64a.bat index 825c69022..ff8b19ccf 100644 --- a/openssl/ms/do_win64a.bat +++ b/openssl/ms/do_win64a.bat @@ -1,9 +1,19 @@ - -perl util\mkfiles.pl >MINFO -perl ms\uplink.pl win64a > ms\uptable.asm -ml64 -c -Foms\uptable.obj ms\uptable.asm -perl util\mk1mf.pl no-asm VC-WIN64A >ms\nt.mak -perl util\mk1mf.pl dll no-asm VC-WIN64A >ms\ntdll.mak - -perl util\mkdef.pl 32 libeay > ms\libeay32.def -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def +perl util\mkfiles.pl >MINFO + +cmd /c "nasm -f win64 -v" >NUL: 2>&1 +if %errorlevel% neq 0 goto ml64 + +perl ms\uplink-x86_64.pl nasm > ms\uptable.asm +nasm -f win64 -o ms\uptable.obj ms\uptable.asm +goto proceed + +:ml64 +perl ms\uplink-x86_64.pl masm > ms\uptable.asm +ml64 -c -Foms\uptable.obj ms\uptable.asm + +:proceed +perl util\mk1mf.pl VC-WIN64A >ms\nt.mak +perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak + +perl util\mkdef.pl 32 libeay > ms\libeay32.def +perl util\mkdef.pl 32 ssleay > ms\ssleay32.def diff --git a/openssl/ms/do_win64i.bat b/openssl/ms/do_win64i.bat index 7bfc2f181..088f5e1d0 100644 --- a/openssl/ms/do_win64i.bat +++ b/openssl/ms/do_win64i.bat @@ -1,9 +1,9 @@ - -perl util\mkfiles.pl >MINFO -perl ms\uplink.pl win64i > ms\uptable.asm -ias -o ms\uptable.obj ms\uptable.asm -perl util\mk1mf.pl no-asm VC-WIN64I >ms\nt.mak -perl util\mk1mf.pl dll no-asm VC-WIN64I >ms\ntdll.mak - -perl util\mkdef.pl 32 libeay > ms\libeay32.def -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def + +perl util\mkfiles.pl >MINFO +perl ms\uplink-ia64.pl > ms\uptable.asm +ias -o ms\uptable.obj ms\uptable.asm +perl util\mk1mf.pl VC-WIN64I >ms\nt.mak +perl util\mk1mf.pl dll VC-WIN64I >ms\ntdll.mak + +perl util\mkdef.pl 32 libeay > ms\libeay32.def +perl util\mkdef.pl 32 ssleay > ms\ssleay32.def diff --git a/openssl/ms/uplink.h b/openssl/ms/uplink.h index a4a67d3c1..4881ba7d4 100644 --- a/openssl/ms/uplink.h +++ b/openssl/ms/uplink.h @@ -23,7 +23,7 @@ extern void *OPENSSL_UplinkTable[]; #define UP_fileno (*(int (*)(void *))OPENSSL_UplinkTable[APPLINK_FILENO]) #define UP_open (*(int (*)(const char *,int,...))OPENSSL_UplinkTable[APPLINK_OPEN]) -#define UP_read (*(ssize_t (*)(int,void *,size_t))OPENSSL_UplinkTable[APPLINK_READ]) -#define UP_write (*(ssize_t (*)(int,const void *,size_t))OPENSSL_UplinkTable[APPLINK_WRITE]) +#define UP_read (*(ossl_ssize_t (*)(int,void *,size_t))OPENSSL_UplinkTable[APPLINK_READ]) +#define UP_write (*(ossl_ssize_t (*)(int,const void *,size_t))OPENSSL_UplinkTable[APPLINK_WRITE]) #define UP_lseek (*(long (*)(int,long,int))OPENSSL_UplinkTable[APPLINK_LSEEK]) #define UP_close (*(int (*)(int))OPENSSL_UplinkTable[APPLINK_CLOSE]) -- cgit v1.2.3