updates for latest build changes
This commit is contained in:
Brent Cook
kinichiro
parent
a241b876e9
commit
659aff9fa7
@ -134,6 +134,7 @@ noinst_HEADERS += constant_time_locl.h
|
||||
noinst_HEADERS += cryptlib.h
|
||||
noinst_HEADERS += md32_common.h
|
||||
noinst_HEADERS += o_time.h
|
||||
noinst_HEADERS += x86_arch.h
|
||||
|
||||
# aes
|
||||
libcrypto_la_SOURCES += aes/aes_cfb.c
|
||||
@ -564,9 +565,6 @@ libcrypto_la_SOURCES += idea/i_ofb64.c
|
||||
libcrypto_la_SOURCES += idea/i_skey.c
|
||||
noinst_HEADERS += idea/idea_lcl.h
|
||||
|
||||
# krb5
|
||||
libcrypto_la_SOURCES += krb5/krb5_asn.c
|
||||
|
||||
# lhash
|
||||
libcrypto_la_SOURCES += lhash/lh_stats.c
|
||||
libcrypto_la_SOURCES += lhash/lhash.c
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
|
||||
ASM_X86_64_ELF = aes/aes-elf-x86_64.s
|
||||
ASM_X86_64_ELF += aes/bsaes-elf-x86_64.s
|
||||
ASM_X86_64_ELF += aes/vpaes-elf-x86_64.s
|
||||
ASM_X86_64_ELF += aes/aesni-elf-x86_64.s
|
||||
ASM_X86_64_ELF += aes/aesni-sha1-elf-x86_64.s
|
||||
ASM_X86_64_ELF += bn/modexp512-elf-x86_64.s
|
||||
ASM_X86_64_ELF += bn/mont-elf-x86_64.s
|
||||
ASM_X86_64_ELF += bn/mont5-elf-x86_64.s
|
||||
ASM_X86_64_ELF += bn/gf2m-elf-x86_64.s
|
||||
ASM_X86_64_ELF += camellia/cmll-elf-x86_64.s
|
||||
ASM_X86_64_ELF += md5/md5-elf-x86_64.s
|
||||
ASM_X86_64_ELF += modes/ghash-elf-x86_64.s
|
||||
ASM_X86_64_ELF += rc4/rc4-elf-x86_64.s
|
||||
ASM_X86_64_ELF += rc4/rc4-md5-elf-x86_64.s
|
||||
ASM_X86_64_ELF += sha/sha1-elf-x86_64.s
|
||||
ASM_X86_64_ELF = aes/aes-elf-x86_64.S
|
||||
ASM_X86_64_ELF += aes/bsaes-elf-x86_64.S
|
||||
ASM_X86_64_ELF += aes/vpaes-elf-x86_64.S
|
||||
ASM_X86_64_ELF += aes/aesni-elf-x86_64.S
|
||||
ASM_X86_64_ELF += aes/aesni-sha1-elf-x86_64.S
|
||||
ASM_X86_64_ELF += bn/modexp512-elf-x86_64.S
|
||||
ASM_X86_64_ELF += bn/mont-elf-x86_64.S
|
||||
ASM_X86_64_ELF += bn/mont5-elf-x86_64.S
|
||||
ASM_X86_64_ELF += bn/gf2m-elf-x86_64.S
|
||||
ASM_X86_64_ELF += camellia/cmll-elf-x86_64.S
|
||||
ASM_X86_64_ELF += md5/md5-elf-x86_64.S
|
||||
ASM_X86_64_ELF += modes/ghash-elf-x86_64.S
|
||||
ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S
|
||||
ASM_X86_64_ELF += rc4/rc4-md5-elf-x86_64.S
|
||||
ASM_X86_64_ELF += sha/sha1-elf-x86_64.S
|
||||
ASM_X86_64_ELF += sha/sha256-elf-x86_64.S
|
||||
ASM_X86_64_ELF += sha/sha512-elf-x86_64.S
|
||||
ASM_X86_64_ELF += whrlpool/wp-elf-x86_64.s
|
||||
ASM_X86_64_ELF += whrlpool/wp-elf-x86_64.S
|
||||
ASM_X86_64_ELF += cpuid-elf-x86_64.S
|
||||
|
||||
EXTRA_DIST += $(ASM_X86_64_ELF)
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
|
||||
ASM_X86_64_MACOSX = aes/aes-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += aes/bsaes-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += aes/vpaes-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += aes/aesni-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += aes/aesni-sha1-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += bn/gf2m-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += camellia/cmll-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += rc4/rc4-md5-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX = aes/aes-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += aes/bsaes-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += aes/vpaes-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += aes/aesni-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += aes/aesni-sha1-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += bn/gf2m-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += camellia/cmll-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += rc4/rc4-md5-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += whrlpool/wp-macosx-x86_64.s
|
||||
ASM_X86_64_MACOSX += whrlpool/wp-macosx-x86_64.S
|
||||
ASM_X86_64_MACOSX += cpuid-macosx-x86_64.S
|
||||
|
||||
EXTRA_DIST += $(ASM_X86_64_MACOSX)
|
||||
|
||||
36
update.sh
36
update.sh
@ -117,7 +117,7 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
|
||||
objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h
|
||||
ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h
|
||||
pem/pem2.h hmac/hmac.h rand/rand.h md5/md5.h
|
||||
krb5/krb5_asn.h asn1/asn1_mac.h x509v3/x509v3.h conf/conf.h ocsp/ocsp.h
|
||||
asn1/asn1_mac.h x509v3/x509v3.h conf/conf.h ocsp/ocsp.h
|
||||
aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h
|
||||
bio/bio.h cast/cast.h cmac/cmac.h conf/conf_api.h des/des.h dh/dh.h
|
||||
dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h
|
||||
@ -169,24 +169,24 @@ gen_asm() {
|
||||
}
|
||||
for abi in elf macosx; do
|
||||
echo generating ASM source for $abi
|
||||
gen_asm_stdout $abi aes/asm/aes-x86_64.pl crypto/aes/aes-$abi-x86_64.s
|
||||
gen_asm_stdout $abi aes/asm/vpaes-x86_64.pl crypto/aes/vpaes-$abi-x86_64.s
|
||||
gen_asm_stdout $abi aes/asm/bsaes-x86_64.pl crypto/aes/bsaes-$abi-x86_64.s
|
||||
gen_asm_stdout $abi aes/asm/aesni-x86_64.pl crypto/aes/aesni-$abi-x86_64.s
|
||||
gen_asm_stdout $abi aes/asm/aesni-sha1-x86_64.pl crypto/aes/aesni-sha1-$abi-x86_64.s
|
||||
gen_asm_stdout $abi bn/asm/modexp512-x86_64.pl crypto/bn/modexp512-$abi-x86_64.s
|
||||
gen_asm_stdout $abi bn/asm/x86_64-mont.pl crypto/bn/mont-$abi-x86_64.s
|
||||
gen_asm_stdout $abi bn/asm/x86_64-mont5.pl crypto/bn/mont5-$abi-x86_64.s
|
||||
gen_asm_stdout $abi bn/asm/x86_64-gf2m.pl crypto/bn/gf2m-$abi-x86_64.s
|
||||
gen_asm_stdout $abi camellia/asm/cmll-x86_64.pl crypto/camellia/cmll-$abi-x86_64.s
|
||||
gen_asm_stdout $abi md5/asm/md5-x86_64.pl crypto/md5/md5-$abi-x86_64.s
|
||||
gen_asm_stdout $abi modes/asm/ghash-x86_64.pl crypto/modes/ghash-$abi-x86_64.s
|
||||
gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl crypto/rc4/rc4-$abi-x86_64.s
|
||||
gen_asm_stdout $abi rc4/asm/rc4-md5-x86_64.pl crypto/rc4/rc4-md5-$abi-x86_64.s
|
||||
gen_asm_stdout $abi sha/asm/sha1-x86_64.pl crypto/sha/sha1-$abi-x86_64.s
|
||||
gen_asm_stdout $abi aes/asm/aes-x86_64.pl crypto/aes/aes-$abi-x86_64.S
|
||||
gen_asm_stdout $abi aes/asm/vpaes-x86_64.pl crypto/aes/vpaes-$abi-x86_64.S
|
||||
gen_asm_stdout $abi aes/asm/bsaes-x86_64.pl crypto/aes/bsaes-$abi-x86_64.S
|
||||
gen_asm_stdout $abi aes/asm/aesni-x86_64.pl crypto/aes/aesni-$abi-x86_64.S
|
||||
gen_asm_stdout $abi aes/asm/aesni-sha1-x86_64.pl crypto/aes/aesni-sha1-$abi-x86_64.S
|
||||
gen_asm_stdout $abi bn/asm/modexp512-x86_64.pl crypto/bn/modexp512-$abi-x86_64.S
|
||||
gen_asm_stdout $abi bn/asm/x86_64-mont.pl crypto/bn/mont-$abi-x86_64.S
|
||||
gen_asm_stdout $abi bn/asm/x86_64-mont5.pl crypto/bn/mont5-$abi-x86_64.S
|
||||
gen_asm_stdout $abi bn/asm/x86_64-gf2m.pl crypto/bn/gf2m-$abi-x86_64.S
|
||||
gen_asm_stdout $abi camellia/asm/cmll-x86_64.pl crypto/camellia/cmll-$abi-x86_64.S
|
||||
gen_asm_stdout $abi md5/asm/md5-x86_64.pl crypto/md5/md5-$abi-x86_64.S
|
||||
gen_asm_stdout $abi modes/asm/ghash-x86_64.pl crypto/modes/ghash-$abi-x86_64.S
|
||||
gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl crypto/rc4/rc4-$abi-x86_64.S
|
||||
gen_asm_stdout $abi rc4/asm/rc4-md5-x86_64.pl crypto/rc4/rc4-md5-$abi-x86_64.S
|
||||
gen_asm_stdout $abi sha/asm/sha1-x86_64.pl crypto/sha/sha1-$abi-x86_64.S
|
||||
gen_asm $abi sha/asm/sha512-x86_64.pl crypto/sha/sha256-$abi-x86_64.S
|
||||
gen_asm $abi sha/asm/sha512-x86_64.pl crypto/sha/sha512-$abi-x86_64.S
|
||||
gen_asm_stdout $abi whrlpool/asm/wp-x86_64.pl crypto/whrlpool/wp-$abi-x86_64.s
|
||||
gen_asm_stdout $abi whrlpool/asm/wp-x86_64.pl crypto/whrlpool/wp-$abi-x86_64.S
|
||||
gen_asm $abi x86_64cpuid.pl crypto/cpuid-$abi-x86_64.S
|
||||
done
|
||||
|
||||
@ -248,7 +248,6 @@ for i in `find $libcrypto_regress -name '*.c'`; do
|
||||
done
|
||||
$CP $libcrypto_regress/evp/evptests.txt tests
|
||||
$CP $libcrypto_regress/aead/aeadtests.txt tests
|
||||
$CP $libcrypto_regress/pqueue/expected.txt tests/pq_expected.txt
|
||||
|
||||
# copy libc tests
|
||||
$CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c
|
||||
@ -264,6 +263,7 @@ done
|
||||
$CP $libssl_regress/unit/tests.h tests
|
||||
$CP $libssl_regress/certs/ca.pem tests
|
||||
$CP $libssl_regress/certs/server.pem tests
|
||||
$CP $libssl_regress/pqueue/expected.txt tests/pq_expected.txt
|
||||
|
||||
# copy libtls tests
|
||||
for i in `find $libtls_regress -name '*.c'`; do
|
||||
|
||||
Loading…
Reference in New Issue
Block a user