diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | crypto/Makefile.am | 4 | ||||
| -rw-r--r-- | crypto/Makefile.am.elf-arm | 18 |
3 files changed, 0 insertions, 41 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 4f3f338..d949bcd 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
| @@ -1,24 +1,5 @@ | |||
| 1 | add_definitions(-DLIBRESSL_CRYPTO_INTERNAL) | 1 | add_definitions(-DLIBRESSL_CRYPTO_INTERNAL) |
| 2 | 2 | ||
| 3 | if(HOST_ASM_ELF_ARMV4) | ||
| 4 | set( | ||
| 5 | ASM_ARMV4_ELF_SRC | ||
| 6 | aes/aes-elf-armv4.S | ||
| 7 | bn/mont-elf-armv4.S | ||
| 8 | sha/sha1-elf-armv4.S | ||
| 9 | sha/sha512-elf-armv4.S | ||
| 10 | sha/sha256-elf-armv4.S | ||
| 11 | modes/ghash-elf-armv4.S | ||
| 12 | armv4cpuid.S | ||
| 13 | armcap.c | ||
| 14 | ) | ||
| 15 | add_definitions(-DAES_ASM) | ||
| 16 | add_definitions(-DOPENSSL_BN_ASM_MONT) | ||
| 17 | add_definitions(-DGHASH_ASM) | ||
| 18 | add_definitions(-DOPENSSL_CPUID_OBJ) | ||
| 19 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC}) | ||
| 20 | endif() | ||
| 21 | |||
| 22 | if(HOST_ASM_ELF_X86_64) | 3 | if(HOST_ASM_ELF_X86_64) |
| 23 | set( | 4 | set( |
| 24 | ASM_X86_64_ELF_SRC | 5 | ASM_X86_64_ELF_SRC |
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 25e6363..df5560e 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
| @@ -185,7 +185,6 @@ include Makefile.am.arc4random | |||
| 185 | libcrypto_la_SOURCES = | 185 | libcrypto_la_SOURCES = |
| 186 | EXTRA_libcrypto_la_SOURCES = | 186 | EXTRA_libcrypto_la_SOURCES = |
| 187 | 187 | ||
| 188 | include Makefile.am.elf-arm | ||
| 189 | include Makefile.am.elf-mips | 188 | include Makefile.am.elf-mips |
| 190 | include Makefile.am.elf-mips64 | 189 | include Makefile.am.elf-mips64 |
| 191 | include Makefile.am.elf-x86_64 | 190 | include Makefile.am.elf-x86_64 |
| @@ -193,7 +192,6 @@ include Makefile.am.macosx-x86_64 | |||
| 193 | include Makefile.am.masm-x86_64 | 192 | include Makefile.am.masm-x86_64 |
| 194 | include Makefile.am.mingw64-x86_64 | 193 | include Makefile.am.mingw64-x86_64 |
| 195 | 194 | ||
| 196 | if !HOST_ASM_ELF_ARM | ||
| 197 | if !HOST_ASM_ELF_MIPS | 195 | if !HOST_ASM_ELF_MIPS |
| 198 | if !HOST_ASM_ELF_MIPS64 | 196 | if !HOST_ASM_ELF_MIPS64 |
| 199 | if !HOST_ASM_ELF_X86_64 | 197 | if !HOST_ASM_ELF_X86_64 |
| @@ -207,7 +205,6 @@ endif | |||
| 207 | endif | 205 | endif |
| 208 | endif | 206 | endif |
| 209 | endif | 207 | endif |
| 210 | endif | ||
| 211 | 208 | ||
| 212 | if HOST_AARCH64 | 209 | if HOST_AARCH64 |
| 213 | if HOST_DARWIN | 210 | if HOST_DARWIN |
| @@ -242,7 +239,6 @@ else | |||
| 242 | libcrypto_la_SOURCES += compat/crypto_lock_win.c | 239 | libcrypto_la_SOURCES += compat/crypto_lock_win.c |
| 243 | endif | 240 | endif |
| 244 | libcrypto_la_SOURCES += crypto_memory.c | 241 | libcrypto_la_SOURCES += crypto_memory.c |
| 245 | noinst_HEADERS += arm_arch.h | ||
| 246 | noinst_HEADERS += constant_time.h | 242 | noinst_HEADERS += constant_time.h |
| 247 | noinst_HEADERS += crypto_internal.h | 243 | noinst_HEADERS += crypto_internal.h |
| 248 | noinst_HEADERS += crypto_local.h | 244 | noinst_HEADERS += crypto_local.h |
diff --git a/crypto/Makefile.am.elf-arm b/crypto/Makefile.am.elf-arm deleted file mode 100644 index 6a9fa50..0000000 --- a/crypto/Makefile.am.elf-arm +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | ASM_ARM_ELF = aes/aes-elf-armv4.S | ||
| 2 | ASM_ARM_ELF += bn/mont-elf-armv4.S | ||
| 3 | ASM_ARM_ELF += sha/sha1-elf-armv4.S | ||
| 4 | ASM_ARM_ELF += sha/sha512-elf-armv4.S | ||
| 5 | ASM_ARM_ELF += sha/sha256-elf-armv4.S | ||
| 6 | ASM_ARM_ELF += modes/ghash-elf-armv4.S | ||
| 7 | ASM_ARM_ELF += armv4cpuid.S | ||
| 8 | ASM_ARM_ELF += armcap.c | ||
| 9 | |||
| 10 | EXTRA_DIST += $(ASM_ARM_ELF) | ||
| 11 | |||
| 12 | if HOST_ASM_ELF_ARM | ||
| 13 | libcrypto_la_CPPFLAGS += -DAES_ASM | ||
| 14 | libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT | ||
| 15 | libcrypto_la_CPPFLAGS += -DGHASH_ASM | ||
| 16 | libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ | ||
| 17 | libcrypto_la_SOURCES += $(ASM_ARM_ELF) | ||
| 18 | endif | ||
