diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile.am | 4 | ||||
| -rw-r--r-- | crypto/Makefile.am.elf-x86_64 | 32 | ||||
| -rw-r--r-- | crypto/Makefile.am.macosx-x86_64 | 32 |
3 files changed, 33 insertions, 35 deletions
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 | |||
| 134 | noinst_HEADERS += cryptlib.h | 134 | noinst_HEADERS += cryptlib.h |
| 135 | noinst_HEADERS += md32_common.h | 135 | noinst_HEADERS += md32_common.h |
| 136 | noinst_HEADERS += o_time.h | 136 | noinst_HEADERS += o_time.h |
| 137 | noinst_HEADERS += x86_arch.h | ||
| 137 | 138 | ||
| 138 | # aes | 139 | # aes |
| 139 | libcrypto_la_SOURCES += aes/aes_cfb.c | 140 | libcrypto_la_SOURCES += aes/aes_cfb.c |
| @@ -564,9 +565,6 @@ libcrypto_la_SOURCES += idea/i_ofb64.c | |||
| 564 | libcrypto_la_SOURCES += idea/i_skey.c | 565 | libcrypto_la_SOURCES += idea/i_skey.c |
| 565 | noinst_HEADERS += idea/idea_lcl.h | 566 | noinst_HEADERS += idea/idea_lcl.h |
| 566 | 567 | ||
| 567 | # krb5 | ||
| 568 | libcrypto_la_SOURCES += krb5/krb5_asn.c | ||
| 569 | |||
| 570 | # lhash | 568 | # lhash |
| 571 | libcrypto_la_SOURCES += lhash/lh_stats.c | 569 | libcrypto_la_SOURCES += lhash/lh_stats.c |
| 572 | libcrypto_la_SOURCES += lhash/lhash.c | 570 | 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 @@ | |||
| 1 | 1 | ||
| 2 | ASM_X86_64_ELF = aes/aes-elf-x86_64.s | 2 | ASM_X86_64_ELF = aes/aes-elf-x86_64.S |
| 3 | ASM_X86_64_ELF += aes/bsaes-elf-x86_64.s | 3 | ASM_X86_64_ELF += aes/bsaes-elf-x86_64.S |
| 4 | ASM_X86_64_ELF += aes/vpaes-elf-x86_64.s | 4 | ASM_X86_64_ELF += aes/vpaes-elf-x86_64.S |
| 5 | ASM_X86_64_ELF += aes/aesni-elf-x86_64.s | 5 | ASM_X86_64_ELF += aes/aesni-elf-x86_64.S |
| 6 | ASM_X86_64_ELF += aes/aesni-sha1-elf-x86_64.s | 6 | ASM_X86_64_ELF += aes/aesni-sha1-elf-x86_64.S |
| 7 | ASM_X86_64_ELF += bn/modexp512-elf-x86_64.s | 7 | ASM_X86_64_ELF += bn/modexp512-elf-x86_64.S |
| 8 | ASM_X86_64_ELF += bn/mont-elf-x86_64.s | 8 | ASM_X86_64_ELF += bn/mont-elf-x86_64.S |
| 9 | ASM_X86_64_ELF += bn/mont5-elf-x86_64.s | 9 | ASM_X86_64_ELF += bn/mont5-elf-x86_64.S |
| 10 | ASM_X86_64_ELF += bn/gf2m-elf-x86_64.s | 10 | ASM_X86_64_ELF += bn/gf2m-elf-x86_64.S |
| 11 | ASM_X86_64_ELF += camellia/cmll-elf-x86_64.s | 11 | ASM_X86_64_ELF += camellia/cmll-elf-x86_64.S |
| 12 | ASM_X86_64_ELF += md5/md5-elf-x86_64.s | 12 | ASM_X86_64_ELF += md5/md5-elf-x86_64.S |
| 13 | ASM_X86_64_ELF += modes/ghash-elf-x86_64.s | 13 | ASM_X86_64_ELF += modes/ghash-elf-x86_64.S |
| 14 | ASM_X86_64_ELF += rc4/rc4-elf-x86_64.s | 14 | ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S |
| 15 | ASM_X86_64_ELF += rc4/rc4-md5-elf-x86_64.s | 15 | ASM_X86_64_ELF += rc4/rc4-md5-elf-x86_64.S |
| 16 | ASM_X86_64_ELF += sha/sha1-elf-x86_64.s | 16 | ASM_X86_64_ELF += sha/sha1-elf-x86_64.S |
| 17 | ASM_X86_64_ELF += sha/sha256-elf-x86_64.S | 17 | ASM_X86_64_ELF += sha/sha256-elf-x86_64.S |
| 18 | ASM_X86_64_ELF += sha/sha512-elf-x86_64.S | 18 | ASM_X86_64_ELF += sha/sha512-elf-x86_64.S |
| 19 | ASM_X86_64_ELF += whrlpool/wp-elf-x86_64.s | 19 | ASM_X86_64_ELF += whrlpool/wp-elf-x86_64.S |
| 20 | ASM_X86_64_ELF += cpuid-elf-x86_64.S | 20 | ASM_X86_64_ELF += cpuid-elf-x86_64.S |
| 21 | 21 | ||
| 22 | EXTRA_DIST += $(ASM_X86_64_ELF) | 22 | 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 @@ | |||
| 1 | 1 | ||
| 2 | ASM_X86_64_MACOSX = aes/aes-macosx-x86_64.s | 2 | ASM_X86_64_MACOSX = aes/aes-macosx-x86_64.S |
| 3 | ASM_X86_64_MACOSX += aes/bsaes-macosx-x86_64.s | 3 | ASM_X86_64_MACOSX += aes/bsaes-macosx-x86_64.S |
| 4 | ASM_X86_64_MACOSX += aes/vpaes-macosx-x86_64.s | 4 | ASM_X86_64_MACOSX += aes/vpaes-macosx-x86_64.S |
| 5 | ASM_X86_64_MACOSX += aes/aesni-macosx-x86_64.s | 5 | ASM_X86_64_MACOSX += aes/aesni-macosx-x86_64.S |
| 6 | ASM_X86_64_MACOSX += aes/aesni-sha1-macosx-x86_64.s | 6 | ASM_X86_64_MACOSX += aes/aesni-sha1-macosx-x86_64.S |
| 7 | ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.s | 7 | ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.S |
| 8 | ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.s | 8 | ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.S |
| 9 | ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.s | 9 | ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.S |
| 10 | ASM_X86_64_MACOSX += bn/gf2m-macosx-x86_64.s | 10 | ASM_X86_64_MACOSX += bn/gf2m-macosx-x86_64.S |
| 11 | ASM_X86_64_MACOSX += camellia/cmll-macosx-x86_64.s | 11 | ASM_X86_64_MACOSX += camellia/cmll-macosx-x86_64.S |
| 12 | ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.s | 12 | ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.S |
| 13 | ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.s | 13 | ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S |
| 14 | ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.s | 14 | ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S |
| 15 | ASM_X86_64_MACOSX += rc4/rc4-md5-macosx-x86_64.s | 15 | ASM_X86_64_MACOSX += rc4/rc4-md5-macosx-x86_64.S |
| 16 | ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.s | 16 | ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S |
| 17 | ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S | 17 | ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S |
| 18 | ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S | 18 | ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S |
| 19 | ASM_X86_64_MACOSX += whrlpool/wp-macosx-x86_64.s | 19 | ASM_X86_64_MACOSX += whrlpool/wp-macosx-x86_64.S |
| 20 | ASM_X86_64_MACOSX += cpuid-macosx-x86_64.S | 20 | ASM_X86_64_MACOSX += cpuid-macosx-x86_64.S |
| 21 | 21 | ||
| 22 | EXTRA_DIST += $(ASM_X86_64_MACOSX) | 22 | EXTRA_DIST += $(ASM_X86_64_MACOSX) |