Commit 165c20c2 authored Aug 14, 2011 by Andy Polyakov

eng_rsax.c: make it work on Win64.

parent 625c6ba4

Configure

+2 −2

Original line number	Diff line number	Diff line
		@@ -495,9 +495,9 @@ my %table=(
		#
		# Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64
		"VC-WIN64I","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32",
		"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o aesni-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32",
		"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
		"debug-VC-WIN64I","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32",
		"debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o aesni-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32",
		"debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
		# x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
		# 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
		"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",

TABLE

+2 −2

Original line number	Diff line number	Diff line
		@@ -753,7 +753,7 @@ $sys_id = WIN64A
		$lflags =
		$bn_ops = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
		$cpuid_obj = x86_64cpuid.o
		$bn_obj = bn_asm.o x86_64-mont.o
		$bn_obj = bn_asm.o x86_64-mont.o modexp512-x86_64.o
		$des_obj =
		$aes_obj = aes-x86_64.o aesni-x86_64.o
		$bf_obj =
		@@ -1497,7 +1497,7 @@ $sys_id = WIN64A
		$lflags =
		$bn_ops = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
		$cpuid_obj = x86_64cpuid.o
		$bn_obj = bn_asm.o x86_64-mont.o
		$bn_obj = bn_asm.o x86_64-mont.o modexp512-x86_64.o
		$des_obj =
		$aes_obj = aes-x86_64.o aesni-x86_64.o
		$bf_obj =

crypto/engine/eng_rsax.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -79,8 +79,7 @@
		#undef COMPILE_RSAX

		#if (defined(__x86_64) \|\| defined(__x86_64__) \|\| \
		defined(_M_AMD64) \|\| defined (_M_X64)) && !defined(OPENSSL_NO_ASM) && \
		!defined(OPENSSL_SYS_WIN32)
		defined(_M_AMD64) \|\| defined (_M_X64)) && !defined(OPENSSL_NO_ASM)
		#define COMPILE_RSAX
		static ENGINE *ENGINE_rsax (void);
		#endif