aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2024-11-05 04:27:16 -0700
committerTheo Buehler <tb@openbsd.org>2024-11-05 04:27:16 -0700
commit1a3e756a757da607621949b43f97fb79b6fb31ae (patch)
treed44d20b0a1934392cd24a05a4385c0765181615a
parentb29d115ad24299042326c358da7444dd1699e36e (diff)
downloadportable-1a3e756a757da607621949b43f97fb79b6fb31ae.tar.gz
portable-1a3e756a757da607621949b43f97fb79b6fb31ae.tar.bz2
portable-1a3e756a757da607621949b43f97fb79b6fb31ae.zip
adapt to my upstream churn
-rw-r--r--crypto/CMakeLists.txt8
-rw-r--r--crypto/Makefile.am8
2 files changed, 4 insertions, 12 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index b5b62ed..5168e79 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -189,15 +189,11 @@ endif()
189set( 189set(
190 CRYPTO_SRC 190 CRYPTO_SRC
191 ${CRYPTO_SRC} 191 ${CRYPTO_SRC}
192 cpt_err.c 192 crypto_err.c
193 cryptlib.c
194 crypto_ex_data.c 193 crypto_ex_data.c
195 crypto_init.c 194 crypto_init.c
196 cversion.c 195 crypto_legacy.c
197 malloc-wrapper.c 196 malloc-wrapper.c
198 mem_clr.c
199 mem_dbg.c
200 o_fips.c
201 aes/aes.c 197 aes/aes.c
202 aes/aes_core.c 198 aes/aes_core.c
203 aes/aes_ige.c 199 aes/aes_ige.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index b4e8bd8..2f61f7d 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -209,20 +209,16 @@ if HOST_I386
209libcrypto_la_SOURCES += arch/i386/crypto_cpu_caps.c 209libcrypto_la_SOURCES += arch/i386/crypto_cpu_caps.c
210endif 210endif
211 211
212libcrypto_la_SOURCES += cpt_err.c 212libcrypto_la_SOURCES += crypto_err.c
213libcrypto_la_SOURCES += cryptlib.c
214libcrypto_la_SOURCES += crypto_ex_data.c 213libcrypto_la_SOURCES += crypto_ex_data.c
215libcrypto_la_SOURCES += crypto_init.c 214libcrypto_la_SOURCES += crypto_init.c
215libcrypto_la_SOURCES += crypto_legacy.c
216if !HOST_WIN 216if !HOST_WIN
217libcrypto_la_SOURCES += crypto_lock.c 217libcrypto_la_SOURCES += crypto_lock.c
218else 218else
219libcrypto_la_SOURCES += compat/crypto_lock_win.c 219libcrypto_la_SOURCES += compat/crypto_lock_win.c
220endif 220endif
221libcrypto_la_SOURCES += cversion.c
222libcrypto_la_SOURCES += malloc-wrapper.c 221libcrypto_la_SOURCES += malloc-wrapper.c
223libcrypto_la_SOURCES += mem_clr.c
224libcrypto_la_SOURCES += mem_dbg.c
225libcrypto_la_SOURCES += o_fips.c
226noinst_HEADERS += arm_arch.h 222noinst_HEADERS += arm_arch.h
227noinst_HEADERS += constant_time.h 223noinst_HEADERS += constant_time.h
228noinst_HEADERS += crypto_internal.h 224noinst_HEADERS += crypto_internal.h