summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xConfigure54
-rw-r--r--Makefile.org4
-rw-r--r--TABLE183
-rw-r--r--crypto/perlasm/x86masm.pl7
-rw-r--r--crypto/perlasm/x86nasm.pl7
-rw-r--r--engines/Makefile13
-rw-r--r--engines/asm/e_padlock-x86.pl424
-rw-r--r--engines/asm/e_padlock-x86_86.pl327
-rw-r--r--engines/e_padlock.c969
9 files changed, 1173 insertions, 815 deletions
diff --git a/Configure b/Configure
index 9bbe36df9e..1f43935a9b 100755
--- a/Configure
+++ b/Configure
@@ -123,24 +123,24 @@ my $tlib="-lnsl -lsocket";
my $bits1="THIRTY_TWO_BIT ";
my $bits2="SIXTY_FOUR_BIT ";
-my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o:des-586.o crypt586.o:aes-586.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o:ghash-x86.o";
+my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o:des-586.o crypt586.o:aes-586.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o:ghash-x86.o:e_padlock-x86.o";
my $x86_elf_asm="$x86_asm:elf";
-my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o::aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o";
-my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o:void";
-my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::ghash-sparcv9.o:void";
-my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o::::::::::::void";
-my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o:void";
-my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o:::::::";
-my $mips64_asm=":bn-mips.o mips-mont.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o:::::::";
-my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o s390x-gf2m.o::aes_ctr.o aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::ghash-s390x.o";
-my $armv4_asm="armcap.o armv4cpuid.o:bn_asm.o armv4-mont.o armv4-gf2m.o::aes_cbc.o aes-armv4.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o:::::::ghash-armv4.o:void";
-my $parisc11_asm="pariscid.o:bn_asm.o parisc-mont.o::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o:32";
-my $parisc20_asm="pariscid.o:pa-risc2W.o parisc-mont.o::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o:64";
-my $ppc32_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o::aes_core.o aes_cbc.o aes-ppc.o:::sha1-ppc.o sha256-ppc.o:::::::";
-my $ppc64_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o::aes_core.o aes_cbc.o aes-ppc.o:::sha1-ppc.o sha256-ppc.o sha512-ppc.o:::::::";
-my $no_asm="::::::::::::::void";
+my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o::aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o:e_padlock-x86_64.o";
+my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o::void";
+my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::ghash-sparcv9.o::void";
+my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void";
+my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o::void";
+my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o::::::::";
+my $mips64_asm=":bn-mips.o mips-mont.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::";
+my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o s390x-gf2m.o::aes_ctr.o aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::ghash-s390x.o:";
+my $armv4_asm="armcap.o armv4cpuid.o:bn_asm.o armv4-mont.o armv4-gf2m.o::aes_cbc.o aes-armv4.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o:::::::ghash-armv4.o::void";
+my $parisc11_asm="pariscid.o:bn_asm.o parisc-mont.o::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::32";
+my $parisc20_asm="pariscid.o:pa-risc2W.o parisc-mont.o::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::64";
+my $ppc32_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o::aes_core.o aes_cbc.o aes-ppc.o:::sha1-ppc.o sha256-ppc.o::::::::";
+my $ppc64_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o::aes_core.o aes_cbc.o aes-ppc.o:::sha1-ppc.o sha256-ppc.o sha512-ppc.o::::::::";
+my $no_asm=":::::::::::::::void";
# As for $BSDthreads. Idea is to maintain "collective" set of flags,
# which would cover all BSD flavors. -pthread applies to them all,
@@ -151,7 +151,7 @@ my $no_asm="::::::::::::::void";
# seems to be sufficient?
my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT";
-#config-string $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $modes_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib
+#config-string $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $modes_obj : $engines_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib
my %table=(
# File 'TABLE' (created by 'make TABLE') contains the data from this list,
@@ -188,7 +188,7 @@ my %table=(
"debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-ia32-aes", "gcc:-DAES_EXPERIMENTAL -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:x86cpuid.o:bn-586.o co-586.o x86-mont.o:des-586.o crypt586.o:aes_x86core.o aes_cbc.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o::ghash-x86.o:elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-linux-ia32-aes", "gcc:-DAES_EXPERIMENTAL -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:x86cpuid.o:bn-586.o co-586.o x86-mont.o:des-586.o crypt586.o:aes_x86core.o aes_cbc.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o::ghash-x86.o:e_padlock-x86.o:elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
@@ -294,8 +294,8 @@ my %table=(
"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-Wl,+s -ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${no_asm}:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"hpux-parisc1_1-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-Wl,+s -ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${parisc11_asm}:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc2-gcc","gcc:-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1::pa-risc2.o:::::::::::::void:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux64-parisc2-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o:::::::::::::void:dlfcn:hpux-shared:-fpic:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_64",
+"hpux-parisc2-gcc","gcc:-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1::pa-risc2.o::::::::::::::void:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux64-parisc2-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o::::::::::::::void:dlfcn:hpux-shared:-fpic:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_64",
# More attempts at unified 10.X and 11.X targets for HP C compiler.
#
@@ -303,7 +303,7 @@ my %table=(
# Kevin Steves <ks@hp.se>
"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"hpux-parisc1_1-cc","cc:+DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${parisc11_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa1.1",
-"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2.o:::::::::::::void:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2.o::::::::::::::void:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${parisc20_asm}:dlfcn:hpux-shared:+Z:+DD64 -b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_64",
# HP/UX IA-64 targets
@@ -512,9 +512,9 @@ my %table=(
# Visual C targets
#
# 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 ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ghash-ia64.o:ias:win32",
+"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 ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ghash-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:".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:::::::ghash-ia64.o:ias: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:::::::ghash-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:".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'
@@ -637,6 +637,7 @@ my $idx_rc5_obj = $idx++;
my $idx_wp_obj = $idx++;
my $idx_cmll_obj = $idx++;
my $idx_modes_obj = $idx++;
+my $idx_engines_obj = $idx++;
my $idx_perlasm_scheme = $idx++;
my $idx_dso_scheme = $idx++;
my $idx_shared_target = $idx++;
@@ -1212,6 +1213,7 @@ my $rc5_obj = $fields[$idx_rc5_obj];
my $wp_obj = $fields[$idx_wp_obj];
my $cmll_obj = $fields[$idx_cmll_obj];
my $modes_obj = $fields[$idx_modes_obj];
+my $engines_obj = $fields[$idx_engines_obj];
my $perlasm_scheme = $fields[$idx_perlasm_scheme];
my $dso_scheme = $fields[$idx_dso_scheme];
my $shared_target = $fields[$idx_shared_target];
@@ -1372,7 +1374,7 @@ if ($no_asm)
{
$cpuid_obj=$bn_obj=
$des_obj=$aes_obj=$bf_obj=$cast_obj=$rc4_obj=$rc5_obj=$cmll_obj=
- $modes_obj=$sha1_obj=$md5_obj=$rmd160_obj=$wp_obj="";
+ $modes_obj=$sha1_obj=$md5_obj=$rmd160_obj=$wp_obj=$engines_obj="";
$cflags=~s/\-D[BL]_ENDIAN// if ($fips);
$thread_cflags=~s/\-D[BL]_ENDIAN// if ($fips);
}
@@ -1701,6 +1703,7 @@ while (<IN>)
s/^WP_ASM_OBJ=.*$/WP_ASM_OBJ= $wp_obj/;
s/^CMLL_ENC=.*$/CMLL_ENC= $cmll_obj/;
s/^MODES_ASM_OBJ.=*$/MODES_ASM_OBJ= $modes_obj/;
+ s/^ENGINES_ASM_OBJ.=*$/ENGINES_ASM_OBJ= $engines_obj/;
s/^PERLASM_SCHEME=.*$/PERLASM_SCHEME= $perlasm_scheme/;
s/^PROCESSOR=.*/PROCESSOR= $processor/;
s/^ARFLAGS=.*/ARFLAGS= $arflags/;
@@ -1773,6 +1776,7 @@ print "SHA1_OBJ_ASM =$sha1_obj\n";
print "RMD160_OBJ_ASM=$rmd160_obj\n";
print "CMLL_ENC =$cmll_obj\n";
print "MODES_OBJ =$modes_obj\n";
+print "ENGINES_OBJ =$engines_obj\n";
print "PROCESSOR =$processor\n";
print "RANLIB =$ranlib\n";
print "ARFLAGS =$arflags\n";
@@ -2192,7 +2196,8 @@ sub print_table_entry
(my $cc,my $cflags,my $unistd,my $thread_cflag,my $sys_id,my $lflags,
my $bn_ops,my $cpuid_obj,my $bn_obj,my $des_obj,my $aes_obj, my $bf_obj,
my $md5_obj,my $sha1_obj,my $cast_obj,my $rc4_obj,my $rmd160_obj,
- my $rc5_obj,my $wp_obj,my $cmll_obj,my $modes_obj,my $perlasm_scheme,my $dso_scheme,my $shared_target,my $shared_cflag,
+ my $rc5_obj,my $wp_obj,my $cmll_obj,my $modes_obj, my $engines_obj,
+ my $perlasm_scheme,my $dso_scheme,my $shared_target,my $shared_cflag,
my $shared_ldflag,my $shared_extension,my $ranlib,my $arflags,my $multilib)=
split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
@@ -2220,6 +2225,7 @@ sub print_table_entry
\$wp_obj = $wp_obj
\$cmll_obj = $cmll_obj
\$modes_obj = $modes_obj
+\$engines_obj = $engines_obj
\$perlasm_scheme = $perlasm_scheme
\$dso_scheme = $dso_scheme
\$shared_target= $shared_target
diff --git a/Makefile.org b/Makefile.org
index 720965b012..a81dc51a52 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -100,6 +100,7 @@ RMD160_ASM_OBJ=
WP_ASM_OBJ=
CMLL_ENC=
MODES_ASM_OBJ=
+ENGINES_ASM_OBJ=
PERLASM_SCHEME=
# KRB5 stuff
@@ -232,6 +233,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)' \
WP_ASM_OBJ='$(WP_ASM_OBJ)' \
MODES_ASM_OBJ='$(MODES_ASM_OBJ)' \
+ ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)' \
PERLASM_SCHEME='$(PERLASM_SCHEME)' \
FIPSLIBDIR='${FIPSLIBDIR}' \
FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}" \
@@ -375,7 +377,7 @@ build_crypto:
build_ssl:
@dir=ssl; target=all; $(BUILD_ONE_CMD)
build_engines:
- @dir=engines; target=all; $(BUILD_ONE_CMD)
+ @dir=engines; target=all; AS='$(CC) -c'; export AS; $(BUILD_ONE_CMD)
build_apps:
@dir=apps; target=all; $(BUILD_ONE_CMD)
build_tests:
diff --git a/TABLE b/TABLE
index d6940be031..dfc7739105 100644
--- a/TABLE
+++ b/TABLE
@@ -22,6 +22,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = win32
$shared_target=
@@ -54,6 +55,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -86,6 +88,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= bsd-gcc-shared
@@ -118,6 +121,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= bsd-gcc-shared
@@ -150,6 +154,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj = ghash-ia64.o
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= bsd-gcc-shared
@@ -182,6 +187,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj = ghash-sparcv9.o
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= bsd-gcc-shared
@@ -214,6 +220,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= bsd-gcc-shared
@@ -246,6 +253,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = a.out
$dso_scheme = dlfcn
$shared_target= bsd-shared
@@ -278,6 +286,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= bsd-shared
@@ -310,6 +319,7 @@ $rc5_obj =
$wp_obj = wp-x86_64.o
$cmll_obj = cmll-x86_64.o cmll_misc.o
$modes_obj = ghash-x86_64.o
+$engines_obj = e_padlock-x86_64.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= bsd-gcc-shared
@@ -342,6 +352,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = coff
$dso_scheme = dlfcn
$shared_target= cygwin-shared
@@ -374,6 +385,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = win32
$shared_target=
@@ -406,6 +418,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = a.out
$dso_scheme =
$shared_target=
@@ -438,6 +451,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -470,6 +484,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -502,6 +517,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -534,6 +550,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= bsd-gcc-shared
@@ -566,6 +583,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= bsd-gcc-shared
@@ -598,6 +616,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= reliantunix-shared
@@ -630,6 +649,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -662,6 +682,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -694,6 +715,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = win32
$shared_target=
@@ -726,6 +748,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = win32
$shared_target=
@@ -758,6 +781,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = win32n
$dso_scheme = win32
$shared_target=
@@ -790,6 +814,7 @@ $rc5_obj =
$wp_obj = wp-x86_64.o
$cmll_obj = cmll-x86_64.o cmll_misc.o
$modes_obj = ghash-x86_64.o
+$engines_obj = e_padlock-x86_64.o
$perlasm_scheme = auto
$dso_scheme = win32
$shared_target=
@@ -822,6 +847,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj = ghash-ia64.o
+$engines_obj =
$perlasm_scheme = ias
$dso_scheme = win32
$shared_target=
@@ -854,6 +880,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = aix32
$dso_scheme = dlfcn
$shared_target= aix-shared
@@ -886,6 +913,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = aix32
$dso_scheme = dlfcn
$shared_target= aix-shared
@@ -918,6 +946,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -950,6 +979,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = aix64
$dso_scheme = dlfcn
$shared_target= aix-shared
@@ -982,6 +1012,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = aix64
$dso_scheme = dlfcn
$shared_target= aix-shared
@@ -1014,6 +1045,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -1046,6 +1078,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj = ghash-armv4.o
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -1078,6 +1111,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -1110,6 +1144,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = beos
$shared_target= beos-shared
@@ -1142,6 +1177,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = beos
$shared_target= beos-shared
@@ -1174,6 +1210,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= bsd-gcc-shared
@@ -1206,6 +1243,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -1238,6 +1276,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -1270,6 +1309,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -1302,6 +1342,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = macosx
$dso_scheme = dlfcn
$shared_target= darwin-shared
@@ -1334,6 +1375,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = osx32
$dso_scheme = dlfcn
$shared_target= darwin-shared
@@ -1366,6 +1408,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = osx64
$dso_scheme = dlfcn
$shared_target= darwin-shared
@@ -1398,6 +1441,7 @@ $rc5_obj =
$wp_obj = wp-x86_64.o
$cmll_obj = cmll-x86_64.o cmll_misc.o
$modes_obj = ghash-x86_64.o
+$engines_obj = e_padlock-x86_64.o
$perlasm_scheme = macosx
$dso_scheme = dlfcn
$shared_target= darwin-shared
@@ -1430,6 +1474,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -1462,6 +1507,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= bsd-shared
@@ -1494,6 +1540,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= cygwin-shared
@@ -1526,6 +1573,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = win32n
$dso_scheme = win32
$shared_target=
@@ -1558,6 +1606,7 @@ $rc5_obj =
$wp_obj = wp-x86_64.o
$cmll_obj = cmll-x86_64.o cmll_misc.o
$modes_obj = ghash-x86_64.o
+$engines_obj = e_padlock-x86_64.o
$perlasm_scheme = auto
$dso_scheme = win32
$shared_target=
@@ -1590,6 +1639,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj = ghash-ia64.o
+$engines_obj =
$perlasm_scheme = ias
$dso_scheme = win32
$shared_target=
@@ -1622,6 +1672,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -1654,6 +1705,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -1686,6 +1738,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -1718,6 +1771,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -1750,6 +1804,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -1782,6 +1837,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -1814,6 +1870,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme =
$shared_target=
@@ -1846,6 +1903,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = macosx
$dso_scheme = dlfcn
$shared_target= darwin-shared
@@ -1878,6 +1936,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = osx32
$dso_scheme = dlfcn
$shared_target= darwin-shared
@@ -1910,6 +1969,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -1942,6 +2002,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -1974,6 +2035,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2006,6 +2068,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2038,6 +2101,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2070,6 +2134,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2102,6 +2167,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2134,6 +2200,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2166,6 +2233,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2198,6 +2266,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2230,6 +2299,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj =
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2262,6 +2332,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target=
@@ -2294,6 +2365,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target=
@@ -2326,6 +2398,7 @@ $rc5_obj =
$wp_obj = wp-x86_64.o
$cmll_obj = cmll-x86_64.o cmll_misc.o
$modes_obj = ghash-x86_64.o
+$engines_obj = e_padlock-x86_64.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2358,6 +2431,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme =
$shared_target=
@@ -2390,6 +2464,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= solaris-shared
@@ -2422,6 +2497,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= solaris-shared
@@ -2454,6 +2530,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj = ghash-sparcv9.o
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= solaris-shared
@@ -2486,6 +2563,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj = ghash-sparcv9.o
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= solaris-shared
@@ -2518,6 +2596,7 @@ $rc5_obj =
$wp_obj = wp-x86_64.o
$cmll_obj = cmll-x86_64.o cmll_misc.o
$modes_obj = ghash-x86_64.o
+$engines_obj = e_padlock-x86_64.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2550,6 +2629,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2582,6 +2662,7 @@ $rc5_obj =
$wp_obj = wp-x86_64.o
$cmll_obj = cmll-x86_64.o cmll_misc.o
$modes_obj = ghash-x86_64.o
+$engines_obj = e_padlock-x86_64.o
$perlasm_scheme = elf
$dso_scheme = dlfcn
$shared_target= linux-shared
@@ -2614,6 +2695,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme = win32
$shared_target= cygwin-shared
@@ -2646,6 +2728,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme = void
$dso_scheme =
$shared_target=
@@ -2678,6 +2761,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -2710,6 +2794,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -2742,6 +2827,7 @@ $rc5_obj = rc5-586.o
$wp_obj = wp_block.o wp-mmx.o
$cmll_obj = cmll-x86.o
$modes_obj = ghash-x86.o
+$engines_obj = e_padlock-x86.o
$perlasm_scheme = elf
$dso_scheme =
$shared_target=
@@ -2774,6 +2860,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -2806,6 +2893,7 @@ $rc5_obj =
$wp_obj =
$cmll_obj =
$modes_obj =
+$engines_obj =
$perlasm_scheme =
$dso_scheme =
$shared_target=
@@ -2838,6 +2926,7 @@ $rc5_obj =
$wp_obj