From: Andy Polyakov Date: Sun, 9 Jan 2005 16:01:58 +0000 (+0000) Subject: Permit "monolithic" AES assembler implementations, i.e. such which would X-Git-Tag: OpenSSL_0_9_7g~17^2~82 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7de4b5b060d14f404d181571de946c4e9b04d6bb;p=oweals%2Fopenssl.git Permit "monolithic" AES assembler implementations, i.e. such which would replace *whole* aes_core.c, not only AES_[de|en]crypt routines. --- diff --git a/Configure b/Configure index c13a414235..f9d827d362 100755 --- a/Configure +++ b/Configure @@ -114,11 +114,11 @@ my $tlib="-lnsl -lsocket"; my $bits1="THIRTY_TWO_BIT "; my $bits2="SIXTY_FOUR_BIT "; -my $x86_elf_asm="x86cpuid-elf.o:asm/bn86-elf.o asm/co86-elf.o:asm/dx86-elf.o asm/yx86-elf.o:asm/ax86-elf.o:asm/bx86-elf.o:asm/mx86-elf.o:asm/sx86-elf.o asm/s512sse2-elf.o:asm/cx86-elf.o:asm/rx86-elf.o:asm/rm86-elf.o:asm/r586-elf.o"; -my $x86_coff_asm="x86cpuid-cof.o:asm/bn86-cof.o asm/co86-cof.o:asm/dx86-cof.o asm/yx86-cof.o:asm/ax86-cof.o:asm/bx86-cof.o:asm/mx86-cof.o:asm/sx86-cof.o asm/s512sse2-cof.o:asm/cx86-cof.o:asm/rx86-cof.o:asm/rm86-cof.o:asm/r586-cof.o"; -my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o:rm86-out.o:r586-out.o"; +my $x86_elf_asm="x86cpuid-elf.o:asm/bn86-elf.o asm/co86-elf.o:asm/dx86-elf.o asm/yx86-elf.o:aes_core.o asm/ax86-elf.o:asm/bx86-elf.o:asm/mx86-elf.o:asm/sx86-elf.o asm/s512sse2-elf.o:asm/cx86-elf.o:asm/rx86-elf.o:asm/rm86-elf.o:asm/r586-elf.o"; +my $x86_coff_asm="x86cpuid-cof.o:asm/bn86-cof.o asm/co86-cof.o:asm/dx86-cof.o asm/yx86-cof.o:aes_core.o asm/ax86-cof.o:asm/bx86-cof.o:asm/mx86-cof.o:asm/sx86-cof.o asm/s512sse2-cof.o:asm/cx86-cof.o:asm/rx86-cof.o:asm/rm86-cof.o:asm/r586-cof.o"; +my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o:dx86-out.o yx86-out.o:aes_core.o ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o:rm86-out.o:r586-out.o"; -my $ia64_asm=":asm/ia64.o::asm/aes-ia64.o:::asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o::asm/rc4-ia64.o::"; +my $ia64_asm=":asm/ia64.o::aes_core.o asm/aes-ia64.o:::asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o::asm/rc4-ia64.o::"; my $no_asm="::::::::::"; @@ -595,7 +595,7 @@ my $rc2 ="crypto/rc2/rc2.h"; my $bf ="crypto/bf/bf_locl.h"; my $bn_asm ="bn_asm.o"; my $des_enc="des_enc.o fcrypt_b.o"; -my $aes_enc=""; +my $aes_enc="aes_core.o"; my $bf_enc ="bf_enc.o"; my $cast_enc="c_enc.o"; my $rc4_enc="rc4_enc.o"; @@ -1200,6 +1200,9 @@ if ($aes_obj =~ /\.o$/) { $cflags.=" -DAES_ASM"; } +else { + $aes_obj=$aes_enc; + } # "Stringify" the C flags string. This permits it to be made part of a string # and works as well on command lines. diff --git a/Makefile.org b/Makefile.org index bd952e3593..eadcc75df9 100644 --- a/Makefile.org +++ b/Makefile.org @@ -111,7 +111,7 @@ DES_ENC= asm/dx86-out.o asm/yx86-out.o #DES_ENC= asm/dx86-out.o asm/yx86-out.o # a.out, FreeBSD #DES_ENC= asm/dx86bsdi.o asm/yx86bsdi.o # bsdi -AES_ASM_OBJ= +AES_ASM_OBJ=aes_core.o # Set BF_ENC to bf_enc.o if you want to use the C version #There are 4 x86 assember options. diff --git a/TABLE b/TABLE index 581be6ad58..5632f9ecb2 100644 --- a/TABLE +++ b/TABLE @@ -92,7 +92,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-cof.o $bn_obj = asm/bn86-cof.o asm/co86-cof.o $des_obj = asm/dx86-cof.o asm/yx86-cof.o -$aes_obj = asm/ax86-cof.o +$aes_obj = aes_core.o asm/ax86-cof.o $bf_obj = asm/bx86-cof.o $md5_obj = asm/mx86-cof.o $sha1_obj = asm/sx86-cof.o asm/s512sse2-cof.o @@ -146,7 +146,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-out.o $bn_obj = bn86-out.o co86-out.o $des_obj = dx86-out.o yx86-out.o -$aes_obj = ax86-out.o +$aes_obj = aes_core.o ax86-out.o $bf_obj = bx86-out.o $md5_obj = mx86-out.o $sha1_obj = sx86-out.o s512sse2-out.o @@ -173,7 +173,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-out.o $bn_obj = bn86-out.o co86-out.o $des_obj = dx86-out.o yx86-out.o -$aes_obj = ax86-out.o +$aes_obj = aes_core.o ax86-out.o $bf_obj = bx86-out.o $md5_obj = mx86-out.o $sha1_obj = sx86-out.o s512sse2-out.o @@ -227,7 +227,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -254,7 +254,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK $cpuid_obj = $bn_obj = asm/ia64.o $des_obj = -$aes_obj = asm/aes-ia64.o +$aes_obj = aes_core.o asm/aes-ia64.o $bf_obj = $md5_obj = $sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o @@ -551,7 +551,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-out.o $bn_obj = bn86-out.o co86-out.o $des_obj = dx86-out.o yx86-out.o -$aes_obj = ax86-out.o +$aes_obj = aes_core.o ax86-out.o $bf_obj = bx86-out.o $md5_obj = mx86-out.o $sha1_obj = sx86-out.o s512sse2-out.o @@ -767,7 +767,7 @@ $bn_ops = BN_LLONG MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -794,7 +794,7 @@ $bn_ops = BN_LLONG MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -1334,7 +1334,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -1685,7 +1685,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -1739,7 +1739,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -1766,7 +1766,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -1847,7 +1847,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -1874,7 +1874,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -1901,7 +1901,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -1928,7 +1928,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -1955,7 +1955,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -2090,7 +2090,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -2279,7 +2279,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -2414,7 +2414,7 @@ $bn_ops = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT $cpuid_obj = $bn_obj = asm/ia64.o $des_obj = -$aes_obj = asm/aes-ia64.o +$aes_obj = aes_core.o asm/aes-ia64.o $bf_obj = $md5_obj = $sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o @@ -2630,7 +2630,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_ $cpuid_obj = $bn_obj = asm/ia64.o $des_obj = -$aes_obj = asm/aes-ia64.o +$aes_obj = aes_core.o asm/aes-ia64.o $bf_obj = $md5_obj = $sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o @@ -2657,7 +2657,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_ $cpuid_obj = $bn_obj = asm/ia64.o $des_obj = -$aes_obj = asm/aes-ia64.o +$aes_obj = aes_core.o asm/aes-ia64.o $bf_obj = $md5_obj = $sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o @@ -2738,7 +2738,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -3035,7 +3035,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-out.o $bn_obj = bn86-out.o co86-out.o $des_obj = dx86-out.o yx86-out.o -$aes_obj = ax86-out.o +$aes_obj = aes_core.o ax86-out.o $bf_obj = bx86-out.o $md5_obj = mx86-out.o $sha1_obj = sx86-out.o s512sse2-out.o @@ -3062,7 +3062,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -3116,7 +3116,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -3143,7 +3143,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK $cpuid_obj = $bn_obj = asm/ia64.o $des_obj = -$aes_obj = asm/aes-ia64.o +$aes_obj = aes_core.o asm/aes-ia64.o $bf_obj = $md5_obj = $sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o @@ -3170,7 +3170,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK $cpuid_obj = $bn_obj = asm/ia64.o $des_obj = -$aes_obj = asm/aes-ia64.o +$aes_obj = aes_core.o asm/aes-ia64.o $bf_obj = $md5_obj = $sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o @@ -3197,7 +3197,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -3332,7 +3332,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -3413,7 +3413,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -3629,7 +3629,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-cof.o $bn_obj = asm/bn86-cof.o asm/co86-cof.o $des_obj = asm/dx86-cof.o asm/yx86-cof.o -$aes_obj = asm/ax86-cof.o +$aes_obj = aes_core.o asm/ax86-cof.o $bf_obj = asm/bx86-cof.o $md5_obj = asm/mx86-cof.o $sha1_obj = asm/sx86-cof.o asm/s512sse2-cof.o @@ -4034,7 +4034,7 @@ $bn_ops = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -4061,7 +4061,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -4277,7 +4277,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -4547,7 +4547,7 @@ $bn_ops = BN_LLONG MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o @@ -4574,7 +4574,7 @@ $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid-elf.o $bn_obj = asm/bn86-elf.o asm/co86-elf.o $des_obj = asm/dx86-elf.o asm/yx86-elf.o -$aes_obj = asm/ax86-elf.o +$aes_obj = aes_core.o asm/ax86-elf.o $bf_obj = asm/bx86-elf.o $md5_obj = asm/mx86-elf.o $sha1_obj = asm/sx86-elf.o asm/s512sse2-elf.o diff --git a/crypto/aes/Makefile.ssl b/crypto/aes/Makefile.ssl index 2bf743ec30..5ee336851f 100644 --- a/crypto/aes/Makefile.ssl +++ b/crypto/aes/Makefile.ssl @@ -17,7 +17,7 @@ MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile.ssl AR= ar r -AES_ASM_OBJ= +AES_ASM_OBJ=aes_core.o CFLAGS= $(INCLUDES) $(CFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) @@ -29,7 +29,7 @@ APPS= LIB=$(TOP)/libcrypto.a LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c aes_ctr.c -LIBOBJ=aes_core.o aes_misc.o aes_ecb.o aes_cbc.o aes_cfb.o aes_ofb.o aes_ctr.o $(AES_ASM_OBJ) +LIBOBJ=aes_misc.o aes_ecb.o aes_cbc.o aes_cfb.o aes_ofb.o aes_ctr.o $(AES_ASM_OBJ) SRC= $(LIBSRC)