updates for latest build changes

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

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)

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)