Skip to content

Commit

Permalink
Disable sha256 assembly
Browse files Browse the repository at this point in the history
  • Loading branch information
botovq committed Nov 8, 2024
1 parent 52b1623 commit 19eef52
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 17 deletions.
8 changes: 0 additions & 8 deletions crypto/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ if(HOST_ASM_ELF_X86_64)
modes/ghash-elf-x86_64.S
rc4/rc4-elf-x86_64.S
sha/sha1-elf-x86_64.S
sha/sha256-elf-x86_64.S
sha/sha512-elf-x86_64.S

bn/arch/amd64/bignum_add.S
Expand All @@ -62,7 +61,6 @@ if(HOST_ASM_ELF_X86_64)
add_definitions(-DGHASH_ASM)
add_definitions(-DRSA_ASM)
add_definitions(-DSHA1_ASM)
add_definitions(-DSHA256_ASM)
add_definitions(-DSHA512_ASM)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC})
endif()
Expand All @@ -81,7 +79,6 @@ if(HOST_ASM_MACOSX_X86_64)
modes/ghash-macosx-x86_64.S
rc4/rc4-macosx-x86_64.S
sha/sha1-macosx-x86_64.S
sha/sha256-macosx-x86_64.S
sha/sha512-macosx-x86_64.S

bn/arch/amd64/bignum_add.S
Expand All @@ -107,7 +104,6 @@ if(HOST_ASM_MACOSX_X86_64)
add_definitions(-DGHASH_ASM)
add_definitions(-DRSA_ASM)
add_definitions(-DSHA1_ASM)
add_definitions(-DSHA256_ASM)
add_definitions(-DSHA512_ASM)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC})
set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm")
Expand All @@ -127,7 +123,6 @@ if(HOST_ASM_MASM_X86_64)
modes/ghash-masm-x86_64.S
rc4/rc4-masm-x86_64.S
sha/sha1-masm-x86_64.S
sha/sha256-masm-x86_64.S
sha/sha512-masm-x86_64.S
)
add_definitions(-Dendbr64=)
Expand All @@ -141,7 +136,6 @@ if(HOST_ASM_MASM_X86_64)
add_definitions(-DGHASH_ASM)
add_definitions(-DRSA_ASM)
add_definitions(-DSHA1_ASM)
add_definitions(-DSHA256_ASM)
add_definitions(-DSHA512_ASM)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM)
Expand All @@ -161,7 +155,6 @@ if(HOST_ASM_MINGW64_X86_64)
modes/ghash-mingw64-x86_64.S
rc4/rc4-mingw64-x86_64.S
sha/sha1-mingw64-x86_64.S
sha/sha256-mingw64-x86_64.S
sha/sha512-mingw64-x86_64.S
)
add_definitions(-Dendbr32=endbr64)
Expand All @@ -175,7 +168,6 @@ if(HOST_ASM_MINGW64_X86_64)
add_definitions(-DGHASH_ASM)
add_definitions(-DRSA_ASM)
add_definitions(-DSHA1_ASM)
add_definitions(-DSHA256_ASM)
add_definitions(-DSHA512_ASM)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC})
endif()
Expand Down
2 changes: 0 additions & 2 deletions crypto/Makefile.am.elf-x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ 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 += 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 += bn/arch/amd64/bignum_add.S
Expand Down Expand Up @@ -39,7 +38,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM
libcrypto_la_CPPFLAGS += -DGHASH_ASM
libcrypto_la_CPPFLAGS += -DRSA_ASM
libcrypto_la_CPPFLAGS += -DSHA1_ASM
libcrypto_la_CPPFLAGS += -DSHA256_ASM
libcrypto_la_CPPFLAGS += -DSHA512_ASM
libcrypto_la_SOURCES += $(ASM_X86_64_ELF)
endif
2 changes: 0 additions & 2 deletions crypto/Makefile.am.macosx-x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ 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 += 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 += bn/arch/amd64/bignum_add.S
Expand Down Expand Up @@ -39,7 +38,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM
libcrypto_la_CPPFLAGS += -DGHASH_ASM
libcrypto_la_CPPFLAGS += -DRSA_ASM
libcrypto_la_CPPFLAGS += -DSHA1_ASM
libcrypto_la_CPPFLAGS += -DSHA256_ASM
libcrypto_la_CPPFLAGS += -DSHA512_ASM
libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX)
endif
2 changes: 0 additions & 2 deletions crypto/Makefile.am.masm-x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ ASM_X86_64_MASM += md5/md5-masm-x86_64.S
ASM_X86_64_MASM += modes/ghash-masm-x86_64.S
ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S
ASM_X86_64_MASM += sha/sha1-masm-x86_64.S
ASM_X86_64_MASM += sha/sha256-masm-x86_64.S
ASM_X86_64_MASM += sha/sha512-masm-x86_64.S

EXTRA_DIST += $(ASM_X86_64_MASM)
Expand All @@ -26,7 +25,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM
libcrypto_la_CPPFLAGS += -DGHASH_ASM
libcrypto_la_CPPFLAGS += -DRSA_ASM
libcrypto_la_CPPFLAGS += -DSHA1_ASM
libcrypto_la_CPPFLAGS += -DSHA256_ASM
libcrypto_la_CPPFLAGS += -DSHA512_ASM
libcrypto_la_SOURCES += $(ASM_X86_64_MASM)
endif
2 changes: 0 additions & 2 deletions crypto/Makefile.am.mingw64-x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ ASM_X86_64_MINGW64 += md5/md5-mingw64-x86_64.S
ASM_X86_64_MINGW64 += modes/ghash-mingw64-x86_64.S
ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S
ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S
ASM_X86_64_MINGW64 += sha/sha256-mingw64-x86_64.S
ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S

EXTRA_DIST += $(ASM_X86_64_MINGW64)
Expand All @@ -27,7 +26,6 @@ libcrypto_la_CPPFLAGS += -DMD5_ASM
libcrypto_la_CPPFLAGS += -DGHASH_ASM
libcrypto_la_CPPFLAGS += -DRSA_ASM
libcrypto_la_CPPFLAGS += -DSHA1_ASM
libcrypto_la_CPPFLAGS += -DSHA256_ASM
libcrypto_la_CPPFLAGS += -DSHA512_ASM
libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64)
endif
1 change: 0 additions & 1 deletion update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@ for abi in elf macosx masm mingw64; do
gen_asm_stdout $abi modes/asm/ghash-x86_64.pl modes/ghash-$abi-x86_64.S
gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl rc4/rc4-$abi-x86_64.S
gen_asm_stdout $abi sha/asm/sha1-x86_64.pl sha/sha1-$abi-x86_64.S
gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha256-$abi-x86_64.S
gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha512-$abi-x86_64.S
done

Expand Down

0 comments on commit 19eef52

Please sign in to comment.