Commit 203ae57f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Generate and use assembly language files in WIN32 build.

parent 529c33f1

ms/do_fips.bat

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ echo Bignum 
cd crypto\bn\asm

perl bn-586.pl win32n %ASMOPTS% > bn_win32.asm

perl co-586.pl win32n %ASMOPTS% > co_win32.asm

perl x86-mont.pl win32n %ASMOPTS% > mt_win32.asm

cd ..\..\..



echo AES

ms/do_nasm.bat

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ echo Bignum 
cd crypto\bn\asm

perl bn-586.pl win32n %ASMOPTS% > bn_win32.asm

perl co-586.pl win32n %ASMOPTS% > co_win32.asm

perl x86-mont.pl win32n %ASMOPTS% > mt_win32.asm

cd ..\..\..



echo AES

util/mk1mf.pl

+2 −2
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ foreach (values %lib_nam) 
		{

		if ($cpuid_asm_obj ne "")

			{

			$lib_obj =~ s/\s(\S*\/cryptlib\S*)/ $1 \$(CPUID_ASM_OBJ)/;

			$lib_obj =~ s/(\S*\/cryptlib\S*)/$1 \$(CPUID_ASM_OBJ)/;

			$rules.=&do_asm_rule($cpuid_asm_obj,$cpuid_asm_src);

			}

		if ($aes_asm_obj ne "")
@@ -882,7 +882,7 @@ foreach (split(/\s+/,$test)) 
	$t=&bname($_);

	my $ltype;

	# Check to see if test program is FIPS

	if (/fips-1.0/)

	if ($fips && /fips-1.0/)

		{

		# If fipsdso link to libosslfips.dll 

		# otherwise perform static link to

util/pl/VC-32.pl

+3 −3
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ if (!$no_asm) 
	{

	$aes_asm_obj='crypto\aes\asm\a_win32.obj';

	$aes_asm_src='crypto\aes\asm\a_win32.asm';

	$bn_asm_obj='crypto\bn\asm\bn_win32.obj';

	$bn_asm_src='crypto\bn\asm\bn_win32.asm';

	$bn_asm_obj='crypto\bn\asm\bn_win32.obj crypto\bn\asm\mt_win32.obj';

	$bn_asm_src='crypto\bn\asm\bn_win32.asm crypto\bn\asm\mt_win32.asm';

	$bnco_asm_obj='crypto\bn\asm\co_win32.obj';

	$bnco_asm_src='crypto\bn\asm\co_win32.asm';

	$des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj';
@@ -212,7 +212,7 @@ if (!$no_asm) 
	$rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm';

	$cpuid_asm_obj='crypto\cpu_win32.obj';

	$cpuid_asm_src='crypto\cpu_win32.asm';

	$cflags.=" -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DAES_ASM -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";

	$cflags.=" -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DAES_ASM -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";

	}



if ($shlib && $FLAVOR !~ /CE/)