diff options
author | Theo Buehler <tb@openbsd.org> | 2024-10-18 09:13:27 -0600 |
---|---|---|
committer | Theo Buehler <tb@openbsd.org> | 2024-10-18 09:13:27 -0600 |
commit | 696c490c0af0f62a68093abb5ed973fabf47f114 (patch) | |
tree | a9319ad0236b083846023a8fbfdb0ef94250f374 /crypto | |
parent | 697cb112639e1fbaab5f544a077b606984db851a (diff) | |
download | portable-696c490c0af0f62a68093abb5ed973fabf47f114.tar.gz portable-696c490c0af0f62a68093abb5ed973fabf47f114.tar.bz2 portable-696c490c0af0f62a68093abb5ed973fabf47f114.zip |
Hook up crypto_cpu_caps_init()
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/CMakeLists.txt | 12 | ||||
-rw-r--r-- | crypto/Makefile.am | 4 | ||||
-rw-r--r-- | crypto/Makefile.am.elf-x86_64 | 2 | ||||
-rw-r--r-- | crypto/Makefile.am.macosx-x86_64 | 2 | ||||
-rw-r--r-- | crypto/Makefile.am.masm-x86_64 | 2 | ||||
-rw-r--r-- | crypto/Makefile.am.mingw64-x86_64 | 2 |
6 files changed, 8 insertions, 16 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}) |
71 | endif() | 69 | endif() |
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") |
120 | endif() | 116 | endif() |
@@ -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) |
157 | endif() | 151 | endif() |
@@ -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}) |
193 | endif() | 185 | endif() |
194 | 186 | ||
187 | if(HOST_X86_64) | ||
188 | set(CRYPTO_SRC ${CRYPTO_SRC} arch/amd64/crypto_cpu_caps.c) | ||
189 | endif() | ||
190 | |||
195 | set( | 191 | set( |
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 | |||
202 | endif | 202 | endif |
203 | endif | 203 | endif |
204 | 204 | ||
205 | if HOST_X86_64 | ||
206 | libcrypto_la_SOURCES += arch/amd64/crypto_cpu_caps.c | ||
207 | endif | ||
208 | |||
205 | libcrypto_la_SOURCES += cpt_err.c | 209 | libcrypto_la_SOURCES += cpt_err.c |
206 | libcrypto_la_SOURCES += cryptlib.c | 210 | libcrypto_la_SOURCES += cryptlib.c |
207 | libcrypto_la_SOURCES += crypto_ex_data.c | 211 | libcrypto_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 | |||
12 | ASM_X86_64_ELF += sha/sha1-elf-x86_64.S | 12 | ASM_X86_64_ELF += sha/sha1-elf-x86_64.S |
13 | ASM_X86_64_ELF += sha/sha256-elf-x86_64.S | 13 | ASM_X86_64_ELF += sha/sha256-elf-x86_64.S |
14 | ASM_X86_64_ELF += sha/sha512-elf-x86_64.S | 14 | ASM_X86_64_ELF += sha/sha512-elf-x86_64.S |
15 | ASM_X86_64_ELF += cpuid-elf-x86_64.S | ||
16 | 15 | ||
17 | ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S | 16 | ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S |
18 | ASM_X86_64_ELF += bn/arch/amd64/bignum_cmadd.S | 17 | ASM_X86_64_ELF += bn/arch/amd64/bignum_cmadd.S |
@@ -43,6 +42,5 @@ libcrypto_la_CPPFLAGS += -DSHA1_ASM | |||
43 | libcrypto_la_CPPFLAGS += -DSHA256_ASM | 42 | libcrypto_la_CPPFLAGS += -DSHA256_ASM |
44 | libcrypto_la_CPPFLAGS += -DSHA512_ASM | 43 | libcrypto_la_CPPFLAGS += -DSHA512_ASM |
45 | libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM | 44 | libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM |
46 | libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ | ||
47 | libcrypto_la_SOURCES += $(ASM_X86_64_ELF) | 45 | libcrypto_la_SOURCES += $(ASM_X86_64_ELF) |
48 | endif | 46 | endif |
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 | |||
12 | ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S | 12 | ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S |
13 | ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S | 13 | ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S |
14 | ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S | 14 | ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S |
15 | ASM_X86_64_MACOSX += cpuid-macosx-x86_64.S | ||
16 | 15 | ||
17 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S | 16 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S |
18 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_cmadd.S | 17 | ASM_X86_64_MACOSX += bn/arch/amd64/bignum_cmadd.S |
@@ -43,6 +42,5 @@ libcrypto_la_CPPFLAGS += -DSHA1_ASM | |||
43 | libcrypto_la_CPPFLAGS += -DSHA256_ASM | 42 | libcrypto_la_CPPFLAGS += -DSHA256_ASM |
44 | libcrypto_la_CPPFLAGS += -DSHA512_ASM | 43 | libcrypto_la_CPPFLAGS += -DSHA512_ASM |
45 | libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM | 44 | libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM |
46 | libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ | ||
47 | libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) | 45 | libcrypto_la_SOURCES += $(ASM_X86_64_MACOSX) |
48 | endif | 46 | endif |
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 | |||
12 | ASM_X86_64_MASM += sha/sha1-masm-x86_64.S | 12 | ASM_X86_64_MASM += sha/sha1-masm-x86_64.S |
13 | ASM_X86_64_MASM += sha/sha256-masm-x86_64.S | 13 | ASM_X86_64_MASM += sha/sha256-masm-x86_64.S |
14 | ASM_X86_64_MASM += sha/sha512-masm-x86_64.S | 14 | ASM_X86_64_MASM += sha/sha512-masm-x86_64.S |
15 | ASM_X86_64_MASM += cpuid-masm-x86_64.S | ||
16 | 15 | ||
17 | EXTRA_DIST += $(ASM_X86_64_MASM) | 16 | EXTRA_DIST += $(ASM_X86_64_MASM) |
18 | 17 | ||
@@ -30,6 +29,5 @@ libcrypto_la_CPPFLAGS += -DSHA1_ASM | |||
30 | libcrypto_la_CPPFLAGS += -DSHA256_ASM | 29 | libcrypto_la_CPPFLAGS += -DSHA256_ASM |
31 | libcrypto_la_CPPFLAGS += -DSHA512_ASM | 30 | libcrypto_la_CPPFLAGS += -DSHA512_ASM |
32 | libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM | 31 | libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM |
33 | libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ | ||
34 | libcrypto_la_SOURCES += $(ASM_X86_64_MASM) | 32 | libcrypto_la_SOURCES += $(ASM_X86_64_MASM) |
35 | endif | 33 | endif |
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 | |||
12 | ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S | 12 | ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S |
13 | ASM_X86_64_MINGW64 += sha/sha256-mingw64-x86_64.S | 13 | ASM_X86_64_MINGW64 += sha/sha256-mingw64-x86_64.S |
14 | ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S | 14 | ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S |
15 | ASM_X86_64_MINGW64 += cpuid-mingw64-x86_64.S | ||
16 | 15 | ||
17 | EXTRA_DIST += $(ASM_X86_64_MINGW64) | 16 | EXTRA_DIST += $(ASM_X86_64_MINGW64) |
18 | 17 | ||
@@ -31,6 +30,5 @@ libcrypto_la_CPPFLAGS += -DSHA1_ASM | |||
31 | libcrypto_la_CPPFLAGS += -DSHA256_ASM | 30 | libcrypto_la_CPPFLAGS += -DSHA256_ASM |
32 | libcrypto_la_CPPFLAGS += -DSHA512_ASM | 31 | libcrypto_la_CPPFLAGS += -DSHA512_ASM |
33 | libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM | 32 | libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM |
34 | libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ | ||
35 | libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) | 33 | libcrypto_la_SOURCES += $(ASM_X86_64_MINGW64) |
36 | endif | 34 | endif |