aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crypto/CMakeLists.txt12
-rw-r--r--crypto/Makefile.am4
-rw-r--r--crypto/Makefile.am.elf-x86_642
-rw-r--r--crypto/Makefile.am.macosx-x86_642
-rw-r--r--crypto/Makefile.am.masm-x86_642
-rw-r--r--crypto/Makefile.am.mingw64-x86_642
-rwxr-xr-xupdate.sh5
7 files changed, 12 insertions, 17 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index ad47f3d..0e3f3f0 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -38,7 +38,6 @@ if(HOST_ASM_ELF_X86_64)
38 sha/sha1-elf-x86_64.S 38 sha/sha1-elf-x86_64.S
39 sha/sha256-elf-x86_64.S 39 sha/sha256-elf-x86_64.S
40 sha/sha512-elf-x86_64.S 40 sha/sha512-elf-x86_64.S
41 cpuid-elf-x86_64.S
42 41
43 bn/arch/amd64/bignum_add.S 42 bn/arch/amd64/bignum_add.S
44 bn/arch/amd64/bignum_cmadd.S 43 bn/arch/amd64/bignum_cmadd.S
@@ -66,7 +65,6 @@ if(HOST_ASM_ELF_X86_64)
66 add_definitions(-DSHA256_ASM) 65 add_definitions(-DSHA256_ASM)
67 add_definitions(-DSHA512_ASM) 66 add_definitions(-DSHA512_ASM)
68 add_definitions(-DWHIRLPOOL_ASM) 67 add_definitions(-DWHIRLPOOL_ASM)
69 add_definitions(-DOPENSSL_CPUID_OBJ)
70 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) 68 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC})
71endif() 69endif()
72 70
@@ -86,7 +84,6 @@ if(HOST_ASM_MACOSX_X86_64)
86 sha/sha1-macosx-x86_64.S 84 sha/sha1-macosx-x86_64.S
87 sha/sha256-macosx-x86_64.S 85 sha/sha256-macosx-x86_64.S
88 sha/sha512-macosx-x86_64.S 86 sha/sha512-macosx-x86_64.S
89 cpuid-macosx-x86_64.S
90 87
91 bn/arch/amd64/bignum_add.S 88 bn/arch/amd64/bignum_add.S
92 bn/arch/amd64/bignum_cmadd.S 89 bn/arch/amd64/bignum_cmadd.S
@@ -114,7 +111,6 @@ if(HOST_ASM_MACOSX_X86_64)
114 add_definitions(-DSHA256_ASM) 111 add_definitions(-DSHA256_ASM)
115 add_definitions(-DSHA512_ASM) 112 add_definitions(-DSHA512_ASM)
116 add_definitions(-DWHIRLPOOL_ASM) 113 add_definitions(-DWHIRLPOOL_ASM)
117 add_definitions(-DOPENSSL_CPUID_OBJ)
118 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) 114 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC})
119 set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm") 115 set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm")
120endif() 116endif()
@@ -135,7 +131,6 @@ if(HOST_ASM_MASM_X86_64)
135 sha/sha1-masm-x86_64.S 131 sha/sha1-masm-x86_64.S
136 sha/sha256-masm-x86_64.S 132 sha/sha256-masm-x86_64.S
137 sha/sha512-masm-x86_64.S 133 sha/sha512-masm-x86_64.S
138 cpuid-masm-x86_64.S
139 ) 134 )
140 add_definitions(-Dendbr64=) 135 add_definitions(-Dendbr64=)
141 add_definitions(-DAES_ASM) 136 add_definitions(-DAES_ASM)
@@ -151,7 +146,6 @@ if(HOST_ASM_MASM_X86_64)
151 add_definitions(-DSHA256_ASM) 146 add_definitions(-DSHA256_ASM)
152 add_definitions(-DSHA512_ASM) 147 add_definitions(-DSHA512_ASM)
153 add_definitions(-DWHIRLPOOL_ASM) 148 add_definitions(-DWHIRLPOOL_ASM)
154 add_definitions(-DOPENSSL_CPUID_OBJ)
155 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) 149 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
156 set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM) 150 set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM)
157endif() 151endif()
@@ -172,7 +166,6 @@ if(HOST_ASM_MINGW64_X86_64)
172 sha/sha1-mingw64-x86_64.S 166 sha/sha1-mingw64-x86_64.S
173 sha/sha256-mingw64-x86_64.S 167 sha/sha256-mingw64-x86_64.S
174 sha/sha512-mingw64-x86_64.S 168 sha/sha512-mingw64-x86_64.S
175 cpuid-mingw64-x86_64.S
176 ) 169 )
177 add_definitions(-Dendbr32=endbr64) 170 add_definitions(-Dendbr32=endbr64)
178 add_definitions(-DAES_ASM) 171 add_definitions(-DAES_ASM)
@@ -188,10 +181,13 @@ if(HOST_ASM_MINGW64_X86_64)
188 add_definitions(-DSHA256_ASM) 181 add_definitions(-DSHA256_ASM)
189 add_definitions(-DSHA512_ASM) 182 add_definitions(-DSHA512_ASM)
190 add_definitions(-DWHIRLPOOL_ASM) 183 add_definitions(-DWHIRLPOOL_ASM)
191 add_definitions(-DOPENSSL_CPUID_OBJ)
192 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) 184 set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC})
193endif() 185endif()
194 186
187if(HOST_X86_64)
188 set(CRYPTO_SRC ${CRYPTO_SRC} arch/amd64/crypto_cpu_caps.c)
189endif()
190
195set( 191set(
196 CRYPTO_SRC 192 CRYPTO_SRC
197 ${CRYPTO_SRC} 193 ${CRYPTO_SRC}
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index a388861..7036509 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -202,6 +202,10 @@ endif
202endif 202endif
203endif 203endif
204 204
205if HOST_X86_64
206libcrypto_la_SOURCES += arch/amd64/crypto_cpu_caps.c
207endif
208
205libcrypto_la_SOURCES += cpt_err.c 209libcrypto_la_SOURCES += cpt_err.c
206libcrypto_la_SOURCES += cryptlib.c 210libcrypto_la_SOURCES += cryptlib.c
207libcrypto_la_SOURCES += crypto_ex_data.c 211libcrypto_la_SOURCES += crypto_ex_data.c
diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64
index 990475e..c00ce02 100644
--- a/crypto/Makefile.am.elf-x86_64
+++ b/crypto/Makefile.am.elf-x86_64
@@ -12,7 +12,6 @@ ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S
12ASM_X86_64_ELF += sha/sha1-elf-x86_64.S 12ASM_X86_64_ELF += sha/sha1-elf-x86_64.S
13ASM_X86_64_ELF += sha/sha256-elf-x86_64.S 13ASM_X86_64_ELF += sha/sha256-elf-x86_64.S
14ASM_X86_64_ELF += sha/sha512-elf-x86_64.S 14ASM_X86_64_ELF += sha/sha512-elf-x86_64.S
15ASM_X86_64_ELF += cpuid-elf-x86_64.S
16 15
17ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S 16ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S
18ASM_X86_64_ELF += bn/arch/amd64/bignum_cmadd.S 17ASM_X86_64_ELF += bn/arch/amd64/bignum_cmadd.S
@@ -43,6 +42,5 @@ libcrypto_la_CPPFLAGS += -DSHA1_ASM
43libcrypto_la_CPPFLAGS += -DSHA256_ASM 42libcrypto_la_CPPFLAGS += -DSHA256_ASM
44libcrypto_la_CPPFLAGS += -DSHA512_ASM 43libcrypto_la_CPPFLAGS += -DSHA512_ASM
45libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM 44libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM
46libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ
47libcrypto_la_SOURCES += $(ASM_X86_64_ELF) 45libcrypto_la_SOURCES += $(ASM_X86_64_ELF)
48endif 46endif
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64
index c380003..cd88b95 100644
--- a/crypto/Makefile.am.macosx-x86_64
+++ b/crypto/Makefile.am.macosx-x86_64
@@ -12,7 +12,6 @@ ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S
12ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S 12ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S
13ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S 13ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S
14ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S 14ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S
15ASM_X86_64_MACOSX += cpuid-macosx-x86_64.S
16 15
17ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S 16ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S
18ASM_X86_64_MACOSX += bn/arch/amd64/bignum_cmadd.S 17ASM_X86_64_MACOSX += bn/arch/amd64/bignum_cmadd.S
@@ -43,6 +42,5 @@ libcrypto_la_CPPFLAGS += -DSHA1_ASM
43libcrypto_la_CPPFLAGS += -DSHA256_ASM 42libcrypto_la_CPPFLAGS += -DSHA256_ASM
44libcrypto_la_CPPFLAGS += -DSHA512_ASM 43libcrypto_la_CPPFLAGS += -DSHA512_ASM
45libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM 44libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM
46libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ
47libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) 45libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX)
48endif 46endif
diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64
index 437638c..9ecccde 100644
--- a/crypto/Makefile.am.masm-x86_64
+++ b/crypto/Makefile.am.masm-x86_64
@@ -12,7 +12,6 @@ ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S
12ASM_X86_64_MASM += sha/sha1-masm-x86_64.S 12ASM_X86_64_MASM += sha/sha1-masm-x86_64.S
13ASM_X86_64_MASM += sha/sha256-masm-x86_64.S 13ASM_X86_64_MASM += sha/sha256-masm-x86_64.S
14ASM_X86_64_MASM += sha/sha512-masm-x86_64.S 14ASM_X86_64_MASM += sha/sha512-masm-x86_64.S
15ASM_X86_64_MASM += cpuid-masm-x86_64.S
16 15
17EXTRA_DIST += $(ASM_X86_64_MASM) 16EXTRA_DIST += $(ASM_X86_64_MASM)
18 17
@@ -30,6 +29,5 @@ libcrypto_la_CPPFLAGS += -DSHA1_ASM
30libcrypto_la_CPPFLAGS += -DSHA256_ASM 29libcrypto_la_CPPFLAGS += -DSHA256_ASM
31libcrypto_la_CPPFLAGS += -DSHA512_ASM 30libcrypto_la_CPPFLAGS += -DSHA512_ASM
32libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM 31libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM
33libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ
34libcrypto_la_SOURCES += $(ASM_X86_64_MASM) 32libcrypto_la_SOURCES += $(ASM_X86_64_MASM)
35endif 33endif
diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64
index 2d41c37..c2464ab 100644
--- a/crypto/Makefile.am.mingw64-x86_64
+++ b/crypto/Makefile.am.mingw64-x86_64
@@ -12,7 +12,6 @@ ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S
12ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S 12ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S
13ASM_X86_64_MINGW64 += sha/sha256-mingw64-x86_64.S 13ASM_X86_64_MINGW64 += sha/sha256-mingw64-x86_64.S
14ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S 14ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S
15ASM_X86_64_MINGW64 += cpuid-mingw64-x86_64.S
16 15
17EXTRA_DIST += $(ASM_X86_64_MINGW64) 16EXTRA_DIST += $(ASM_X86_64_MINGW64)
18 17
@@ -31,6 +30,5 @@ libcrypto_la_CPPFLAGS += -DSHA1_ASM
31libcrypto_la_CPPFLAGS += -DSHA256_ASM 30libcrypto_la_CPPFLAGS += -DSHA256_ASM
32libcrypto_la_CPPFLAGS += -DSHA512_ASM 31libcrypto_la_CPPFLAGS += -DSHA512_ASM
33libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM 32libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM
34libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ
35libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) 33libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64)
36endif 34endif
diff --git a/update.sh b/update.sh
index 2948e0f..8fdae9d 100755
--- a/update.sh
+++ b/update.sh
@@ -172,6 +172,10 @@ for i in $libcrypto_src/arch/*; do
172 $CP $libcrypto_src/arch/$arch/opensslconf.h include/arch/$arch/ 172 $CP $libcrypto_src/arch/$arch/opensslconf.h include/arch/$arch/
173 mkdir -p crypto/arch/$arch 173 mkdir -p crypto/arch/$arch
174 $CP $libcrypto_src/arch/$arch/crypto_arch.h crypto/arch/$arch/ 174 $CP $libcrypto_src/arch/$arch/crypto_arch.h crypto/arch/$arch/
175 crypto_cpu_caps=$libcrypto_src/arch/$arch/crypto_cpu_caps.c
176 if [ -f "$crypto_cpu_caps" ]; then
177 $CP "$crypto_cpu_caps" crypto/arch/$arch/
178 fi
175done 179done
176 180
177for i in $libcrypto_src/bn/arch/*; do 181for i in $libcrypto_src/bn/arch/*; do
@@ -282,7 +286,6 @@ for abi in elf macosx masm mingw64; do
282 gen_asm_stdout $abi sha/asm/sha1-x86_64.pl sha/sha1-$abi-x86_64.S 286 gen_asm_stdout $abi sha/asm/sha1-x86_64.pl sha/sha1-$abi-x86_64.S
283 gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha256-$abi-x86_64.S 287 gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha256-$abi-x86_64.S
284 gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha512-$abi-x86_64.S 288 gen_asm $abi sha/asm/sha512-x86_64.pl sha/sha512-$abi-x86_64.S
285 gen_asm $abi x86_64cpuid.pl cpuid-$abi-x86_64.S
286done 289done
287 290
288# copy libtls source 291# copy libtls source
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-15 21:59:51 +0000