Skip to content

Commit

Permalink
Disable sha1 assembly on amd64
Browse files Browse the repository at this point in the history
  • Loading branch information
@botovq
botovq committed Dec 5, 2024
1 parent f843a34 commit 694d869
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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ if(HOST_ASM_ELF_X86_64)
md5/md5-elf-x86_64.S
modes/ghash-elf-x86_64.S
rc4/rc4-elf-x86_64.S
sha/sha1-elf-x86_64.S

bn/arch/amd64/bignum_add.S
bn/arch/amd64/bignum_cmadd.S
Expand All @@ -59,7 +58,6 @@ if(HOST_ASM_ELF_X86_64)
add_definitions(-DMD5_ASM)
add_definitions(-DGHASH_ASM)
add_definitions(-DRSA_ASM)
add_definitions(-DSHA1_ASM)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC})
endif()

Expand All @@ -76,7 +74,6 @@ if(HOST_ASM_MACOSX_X86_64)
md5/md5-macosx-x86_64.S
modes/ghash-macosx-x86_64.S
rc4/rc4-macosx-x86_64.S
sha/sha1-macosx-x86_64.S

bn/arch/amd64/bignum_add.S
bn/arch/amd64/bignum_cmadd.S
Expand All @@ -100,7 +97,6 @@ if(HOST_ASM_MACOSX_X86_64)
add_definitions(-DMD5_ASM)
add_definitions(-DGHASH_ASM)
add_definitions(-DRSA_ASM)
add_definitions(-DSHA1_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")
endif()
Expand All @@ -118,7 +114,6 @@ if(HOST_ASM_MASM_X86_64)
md5/md5-masm-x86_64.S
modes/ghash-masm-x86_64.S
rc4/rc4-masm-x86_64.S
sha/sha1-masm-x86_64.S
)
add_definitions(-Dendbr64=)
add_definitions(-DAES_ASM)
Expand All @@ -130,7 +125,6 @@ if(HOST_ASM_MASM_X86_64)
add_definitions(-DMD5_ASM)
add_definitions(-DGHASH_ASM)
add_definitions(-DRSA_ASM)
add_definitions(-DSHA1_ASM)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM)
endif()
Expand All @@ -148,7 +142,6 @@ if(HOST_ASM_MINGW64_X86_64)
md5/md5-mingw64-x86_64.S
modes/ghash-mingw64-x86_64.S
rc4/rc4-mingw64-x86_64.S
sha/sha1-mingw64-x86_64.S
)
add_definitions(-Dendbr32=endbr64)
add_definitions(-DAES_ASM)
Expand All @@ -160,7 +153,6 @@ if(HOST_ASM_MINGW64_X86_64)
add_definitions(-DMD5_ASM)
add_definitions(-DGHASH_ASM)
add_definitions(-DRSA_ASM)
add_definitions(-DSHA1_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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ ASM_X86_64_ELF += bn/mont5-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 += sha/sha1-elf-x86_64.S

ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S
ASM_X86_64_ELF += bn/arch/amd64/bignum_cmadd.S
Expand All @@ -36,6 +35,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
libcrypto_la_CPPFLAGS += -DMD5_ASM
libcrypto_la_CPPFLAGS += -DGHASH_ASM
libcrypto_la_CPPFLAGS += -DRSA_ASM
libcrypto_la_CPPFLAGS += -DSHA1_ASM
libcrypto_la_SOURCES += $(ASM_X86_64_ELF)
endif
2 changes: 0 additions & 2 deletions crypto/Makefile.am.macosx-x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ ASM_X86_64_MACOSX += bn/mont5-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 += sha/sha1-macosx-x86_64.S

ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S
ASM_X86_64_MACOSX += bn/arch/amd64/bignum_cmadd.S
Expand All @@ -36,6 +35,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
libcrypto_la_CPPFLAGS += -DMD5_ASM
libcrypto_la_CPPFLAGS += -DGHASH_ASM
libcrypto_la_CPPFLAGS += -DRSA_ASM
libcrypto_la_CPPFLAGS += -DSHA1_ASM
libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX)
endif
2 changes: 0 additions & 2 deletions crypto/Makefile.am.masm-x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ ASM_X86_64_MASM += bn/mont5-masm-x86_64.S
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

EXTRA_DIST += $(ASM_X86_64_MASM)

Expand All @@ -23,6 +22,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
libcrypto_la_CPPFLAGS += -DMD5_ASM
libcrypto_la_CPPFLAGS += -DGHASH_ASM
libcrypto_la_CPPFLAGS += -DRSA_ASM
libcrypto_la_CPPFLAGS += -DSHA1_ASM
libcrypto_la_SOURCES += $(ASM_X86_64_MASM)
endif
2 changes: 0 additions & 2 deletions crypto/Makefile.am.mingw64-x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ ASM_X86_64_MINGW64 += aes/aesni-mingw64-x86_64.S
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

EXTRA_DIST += $(ASM_X86_64_MINGW64)

Expand All @@ -24,6 +23,5 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
libcrypto_la_CPPFLAGS += -DMD5_ASM
libcrypto_la_CPPFLAGS += -DGHASH_ASM
libcrypto_la_CPPFLAGS += -DRSA_ASM
libcrypto_la_CPPFLAGS += -DSHA1_ASM
libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64)
endif
1 change: 0 additions & 1 deletion update.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@ for abi in elf macosx masm mingw64; do
gen_asm_stdout $abi md5/asm/md5-x86_64.pl md5/md5-$abi-x86_64.S
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
done

# copy libtls source
Expand Down

0 comments on commit 694d869

Please sign in to comment.