From 659aff9fa7cbfefff28c248f611b13b8ae8424aa Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sat, 5 Nov 2016 05:21:29 -0500 Subject: updates for latest build changes --- crypto/Makefile.am | 4 +--- crypto/Makefile.am.elf-x86_64 | 32 ++++++++++++++++---------------- crypto/Makefile.am.macosx-x86_64 | 32 ++++++++++++++++---------------- 3 files changed, 33 insertions(+), 35 deletions(-) (limited to 'crypto') diff --git a/crypto/Makefile.am b/crypto/Makefile.am index d9f64d9..1398863 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -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 diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64 index 44e08a1..4cd34e2 100644 --- a/crypto/Makefile.am.elf-x86_64 +++ b/crypto/Makefile.am.elf-x86_64 @@ -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) diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64 index bc2aaad..2118156 100644 --- a/crypto/Makefile.am.macosx-x86_64 +++ b/crypto/Makefile.am.macosx-x86_64 @@ -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) -- cgit v1.2.3-55-g6feb