Commit 8ca28da0 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Integrate Vector Permutation AES into build system.

parent b889a604

Configure

+6 −5
Original line number Original line Diff line number Diff line
@@ -123,11 +123,11 @@ my $tlib="-lnsl -lsocket"; 
my $bits1="THIRTY_TWO_BIT ";

my $bits1="THIRTY_TWO_BIT ";

my $bits2="SIXTY_FOUR_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:e_padlock-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 vpaes-x86.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_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:e_padlock-x86_64.o";

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 vpaes-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 $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 $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 $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void";
@@ -369,8 +369,8 @@ my %table=( 
# alongside generic one, e.g. as /lib/highgprs/libcrypto.so.x.y, for

# alongside generic one, e.g. as /lib/highgprs/libcrypto.so.x.y, for

# ldconfig and run-time linker to autodiscover. Unfortunately it

# ldconfig and run-time linker to autodiscover. Unfortunately it

# doesn't work just yet, because of couple of bugs in glibc

# doesn't work just yet, because of couple of bugs in glibc

# sysdep/s390/dl-procinfo.c affecting ldconfig and ld.so.1...

# sysdeps/s390/dl-procinfo.c affecting ldconfig and ld.so.1...

"linux32-s390x",	"gcc:-m31 -Wa,-mzarch -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".($s390x_asm=~s/bn\-s390x\.o/bn_asm.o/,$s390x_asm).":31:dlfcn:linux-shared:-fPIC:-m31:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/highgprs",

"linux32-s390x",	"gcc:-m31 -Wa,-mzarch -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$s390x_asm;$asm=~s/bn\-s390x\.o/bn_asm.o/;$asm}.":31:dlfcn:linux-shared:-fPIC:-m31:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/highgprs",

#### SPARC Linux setups

#### SPARC Linux setups

# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently

# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently

# assisted with debugging of following two configs.

# assisted with debugging of following two configs.
@@ -1551,7 +1551,8 @@ if ($aes_obj =~ /\.o$/) 
	# aes_ctr.o is not a real file, only indication that assembler

	# aes_ctr.o is not a real file, only indication that assembler

	# module implements AES_ctr32_encrypt...

	# module implements AES_ctr32_encrypt...

	$cflags.=" -DAES_CTR_ASM" if ($aes_obj =~ s/\s*aes_ctr\.o//);

	$cflags.=" -DAES_CTR_ASM" if ($aes_obj =~ s/\s*aes_ctr\.o//);

	$aes_obj =~ s/\s*aesni\-x86\.o// if ($no_sse2);

	$aes_obj =~ s/\s*(vpaes|aesni)\-x86\.o// if ($no_sse2);

	$cflags.=" -DVPAES_ASM" if ($aes_obj =~ m/vpaes/);

	}

	}

else	{

else	{

	$aes_obj=$aes_enc;

	$aes_obj=$aes_enc;

TABLE

+44 −44
Original line number Original line Diff line number Diff line
@@ -242,7 +242,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -275,7 +275,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -308,7 +308,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL 
$cpuid_obj    = x86_64cpuid.o

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$des_obj      = 

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$aes_obj      = aes-x86_64.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$bf_obj       = 

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
@@ -341,7 +341,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -407,7 +407,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -572,7 +572,7 @@ $bn_ops = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -770,7 +770,7 @@ $bn_ops = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -803,7 +803,7 @@ $bn_ops = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN 
$cpuid_obj    = x86_64cpuid.o

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = bn_asm.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$bn_obj       = bn_asm.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$des_obj      = 

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$aes_obj      = aes-x86_64.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$bf_obj       = 

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
@@ -1133,7 +1133,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -1166,7 +1166,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -1199,7 +1199,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -1331,7 +1331,7 @@ $bn_ops = BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -1430,7 +1430,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL 
$cpuid_obj    = x86_64cpuid.o

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$des_obj      = 

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$aes_obj      = aes-x86_64.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$bf_obj       = 

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
@@ -1496,7 +1496,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -1562,7 +1562,7 @@ $bn_ops = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -1595,7 +1595,7 @@ $bn_ops = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN 
$cpuid_obj    = x86_64cpuid.o

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = bn_asm.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$bn_obj       = bn_asm.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$des_obj      = 

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$aes_obj      = aes-x86_64.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$bf_obj       = 

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
@@ -1859,7 +1859,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -1892,7 +1892,7 @@ $bn_ops = BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -2024,7 +2024,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -2057,7 +2057,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -2156,7 +2156,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -2189,7 +2189,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -2321,7 +2321,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -2354,7 +2354,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -2387,7 +2387,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL 
$cpuid_obj    = x86_64cpuid.o

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$des_obj      = 

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$aes_obj      = aes-x86_64.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$bf_obj       = 

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
@@ -2420,7 +2420,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -2585,7 +2585,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL 
$cpuid_obj    = x86_64cpuid.o

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$des_obj      = 

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$aes_obj      = aes-x86_64.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$bf_obj       = 

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
@@ -2618,7 +2618,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -2651,7 +2651,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL 
$cpuid_obj    = x86_64cpuid.o

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$des_obj      = 

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$aes_obj      = aes-x86_64.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$bf_obj       = 

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
@@ -2816,7 +2816,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -3410,7 +3410,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -3773,7 +3773,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -3839,7 +3839,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -3938,7 +3938,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -4202,7 +4202,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL 
$cpuid_obj    = x86_64cpuid.o

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$des_obj      = 

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$aes_obj      = aes-x86_64.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$bf_obj       = 

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
@@ -4334,7 +4334,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT EXPORT_V 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -4367,7 +4367,7 @@ $bn_ops = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN 
$cpuid_obj    = x86_64cpuid.o

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$des_obj      = 

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$aes_obj      = aes-x86_64.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$bf_obj       = 

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
@@ -4961,7 +4961,7 @@ $bn_ops = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -4994,7 +4994,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -5258,7 +5258,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -5357,7 +5357,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL 
$cpuid_obj    = x86_64cpuid.o

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$des_obj      = 

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$aes_obj      = aes-x86_64.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$bf_obj       = 

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
@@ -5390,7 +5390,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL 
$cpuid_obj    = x86_64cpuid.o

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o

$des_obj      = 

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$aes_obj      = aes-x86_64.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o

$bf_obj       = 

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
@@ -5720,7 +5720,7 @@ $bn_ops = BN_LLONG MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o
@@ -5753,7 +5753,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT 
$cpuid_obj    = x86cpuid.o

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$des_obj      = des-586.o crypt586.o

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o aesni-x86.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

crypto/aes/Makefile

+4 −0
Original line number Original line Diff line number Diff line
@@ -50,11 +50,15 @@ aes-ia64.s: asm/aes-ia64.S 




aes-586.s:	asm/aes-586.pl ../perlasm/x86asm.pl

aes-586.s:	asm/aes-586.pl ../perlasm/x86asm.pl

	$(PERL) asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

	$(PERL) asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

vpaes-x86.s:	asm/vpaes-x86.pl ../perlasm/x86asm.pl

	$(PERL) asm/vpaes-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

aesni-x86.s:	asm/aesni-x86.pl ../perlasm/x86asm.pl

aesni-x86.s:	asm/aesni-x86.pl ../perlasm/x86asm.pl

	$(PERL) asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

	$(PERL) asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@





aes-x86_64.s: asm/aes-x86_64.pl

aes-x86_64.s: asm/aes-x86_64.pl

	$(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@

	$(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@

vpaes-x86_64.s:	asm/vpaes-x86_64.pl

	$(PERL) asm/vpaes-x86_64.pl $(PERLASM_SCHEME) > $@

aesni-x86_64.s: asm/aesni-x86_64.pl

aesni-x86_64.s: asm/aesni-x86_64.pl

	$(PERL) asm/aesni-x86_64.pl $(PERLASM_SCHEME) > $@

	$(PERL) asm/aesni-x86_64.pl $(PERLASM_SCHEME) > $@

aesni-sha1-x86_64.s:	asm/aesni-sha1-x86_64.pl

aesni-sha1-x86_64.s:	asm/aesni-sha1-x86_64.pl

crypto/aes/asm/vpaes-x86.pl

+4 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
# about its alignment...

# about its alignment...

#

#

# Performance summary. aes-586.pl column lists large-block CBC

# Performance summary. aes-586.pl column lists large-block CBC

# encrypt/decrypt/with-hypert-hreading-off(*) results in cycles per

# encrypt/decrypt/with-hyper-threading-off(*) results in cycles per

# byte processed with 128-bit key, and vpaes-x86.pl column -

# byte processed with 128-bit key, and vpaes-x86.pl column -

# encrypt/decrypt.

# encrypt/decrypt.

#

#
@@ -41,7 +41,8 @@ 
#

#

# (***)	Less impressive improvement on Core 2 and Atom is due to slow

# (***)	Less impressive improvement on Core 2 and Atom is due to slow

#	pshufb,	yet it's respectable +32%/65%  improvement on Core 2

#	pshufb,	yet it's respectable +32%/65%  improvement on Core 2

#	and +58%/40% on Atom.

#	and +58%/40% on Atom (as implied, over "hyper-threading-safe"

#	code path).

#

#

#						<appro@openssl.org>

#						<appro@openssl.org>
@@ -51,7 +52,7 @@ require "x86asm.pl"; 




&asm_init($ARGV[0],"vpaes-x86.pl",$x86only = $ARGV[$#ARGV] eq "386");

&asm_init($ARGV[0],"vpaes-x86.pl",$x86only = $ARGV[$#ARGV] eq "386");





$PREFIX="AES";

$PREFIX="vpaes";





my  ($round, $base, $magic, $key, $const, $inp, $out)=

my  ($round, $base, $magic, $key, $const, $inp, $out)=

    ("eax",  "ebx", "ecx",  "edx","ebp",  "esi","edi");

    ("eax",  "ebx", "ecx",  "edx","ebp",  "esi","edi");

crypto/aes/asm/vpaes-x86_64.pl

+4 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
# about its alignment...

# about its alignment...

#

#

# Performance summary. aes-x86_64.pl column lists large-block CBC

# Performance summary. aes-x86_64.pl column lists large-block CBC

# encrypt/decrypt/with-hypert-hreading-off(*) results in cycles per

# encrypt/decrypt/with-hyper-threading-off(*) results in cycles per

# byte processed with 128-bit key, and vpaes-x86_64.pl column -

# byte processed with 128-bit key, and vpaes-x86_64.pl column -

# encrypt/decrypt.

# encrypt/decrypt.

#

#
@@ -40,7 +40,8 @@ 
# (**)	"Core 2" refers to initial 65nm design, a.k.a. Conroe.

# (**)	"Core 2" refers to initial 65nm design, a.k.a. Conroe.

#

#

# (***)	Less impressive improvement on Core 2 and Atom is due to slow

# (***)	Less impressive improvement on Core 2 and Atom is due to slow

#	pshufb,	yet it's respectable +40%/78% improvement on Core 2.

#	pshufb,	yet it's respectable +40%/78% improvement on Core 2

#	(as implied, over "hyper-threading-safe" code path).

#

#

#						<appro@openssl.org>

#						<appro@openssl.org>
@@ -57,7 +58,7 @@ die "can't locate x86_64-xlate.pl"; 




open STDOUT,"| $^X $xlate $flavour $output";

open STDOUT,"| $^X $xlate $flavour $output";





$PREFIX="AES";

$PREFIX="vpaes";





$code.=<<___;

$code.=<<___;

.text

.text