From 9b54faaf977458a3c9c44aafe81ceee00956ba37 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Sat, 2 Mar 2024 07:37:36 -0700 Subject: Update build system for file removal --- crypto/CMakeLists.txt | 24 ++---------------------- crypto/Makefile.am | 32 +++++--------------------------- tests/CMakeLists.txt | 5 ----- tests/Makefile.am | 5 ----- update.sh | 2 +- 5 files changed, 8 insertions(+), 60 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index a5e08c5..c614735 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -277,7 +277,6 @@ set( asn1/a_time_tm.c asn1/a_type.c asn1/a_utf8.c - asn1/ameth_lib.c asn1/asn1_err.c asn1/asn1_gen.c asn1/asn1_item.c @@ -488,7 +487,6 @@ set( evp/bio_enc.c evp/bio_md.c evp/e_aes.c - evp/e_aes_cbc_hmac_sha1.c evp/e_bf.c evp/e_camellia.c evp/e_cast.c @@ -496,12 +494,10 @@ set( evp/e_chacha20poly1305.c evp/e_des.c evp/e_des3.c - evp/e_gost2814789.c evp/e_idea.c evp/e_null.c evp/e_rc2.c evp/e_rc4.c - evp/e_rc4_hmac_md5.c evp/e_sm4.c evp/e_xcbc_d.c evp/evp_aead.c @@ -513,8 +509,6 @@ set( evp/evp_names.c evp/evp_pbe.c evp/evp_pkey.c - evp/m_gost2814789.c - evp/m_gostr341194.c evp/m_md4.c evp/m_md5.c evp/m_md5_sha1.c @@ -523,7 +517,6 @@ set( evp/m_sha1.c evp/m_sha3.c evp/m_sigver.c - evp/m_streebog.c evp/m_sm3.c evp/m_wp.c evp/p_legacy.c @@ -533,20 +526,6 @@ set( evp/pmeth_fn.c evp/pmeth_gn.c evp/pmeth_lib.c - gost/gost2814789.c - gost/gost89_keywrap.c - gost/gost89_params.c - gost/gost89imit_ameth.c - gost/gost89imit_pmeth.c - gost/gost_asn1.c - gost/gost_err.c - gost/gostr341001.c - gost/gostr341001_ameth.c - gost/gostr341001_key.c - gost/gostr341001_params.c - gost/gostr341001_pmeth.c - gost/gostr341194.c - gost/streebog.c hkdf/hkdf.c hmac/hm_ameth.c hmac/hm_pmeth.c @@ -558,7 +537,6 @@ set( idea/i_skey.c kdf/hkdf_evp.c kdf/kdf_err.c - lhash/lh_stats.c lhash/lhash.c md4/md4.c md5/md5.c @@ -901,11 +879,13 @@ target_include_directories(crypto_obj evp hidden hmac + lhash modes ocsp pkcs12 rsa sha + stack x509 ../include/compat PUBLIC diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 0fed0cc..d6fb3d0 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -13,11 +13,13 @@ AM_CPPFLAGS += -I$(top_srcdir)/crypto/ecdh AM_CPPFLAGS += -I$(top_srcdir)/crypto/ecdsa AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp AM_CPPFLAGS += -I$(top_srcdir)/crypto/hmac +AM_CPPFLAGS += -I$(top_srcdir)/crypto/lhash AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes AM_CPPFLAGS += -I$(top_srcdir)/crypto/ocsp AM_CPPFLAGS += -I$(top_srcdir)/crypto/pkcs12 AM_CPPFLAGS += -I$(top_srcdir)/crypto/rsa AM_CPPFLAGS += -I$(top_srcdir)/crypto/sha +AM_CPPFLAGS += -I$(top_srcdir)/crypto/stack AM_CPPFLAGS += -I$(top_srcdir)/crypto/x509 AM_CPPFLAGS += -I$(top_srcdir)/crypto @@ -229,6 +231,7 @@ noinst_HEADERS += arm_arch.h noinst_HEADERS += constant_time.h noinst_HEADERS += cryptlib.h noinst_HEADERS += crypto_internal.h +noinst_HEADERS += crypto_local.h noinst_HEADERS += md32_common.h noinst_HEADERS += x86_arch.h @@ -259,7 +262,6 @@ libcrypto_la_SOURCES += asn1/a_time_posix.c libcrypto_la_SOURCES += asn1/a_time_tm.c libcrypto_la_SOURCES += asn1/a_type.c libcrypto_la_SOURCES += asn1/a_utf8.c -libcrypto_la_SOURCES += asn1/ameth_lib.c libcrypto_la_SOURCES += asn1/asn1_err.c libcrypto_la_SOURCES += asn1/asn1_gen.c libcrypto_la_SOURCES += asn1/asn1_item.c @@ -601,7 +603,6 @@ libcrypto_la_SOURCES += evp/bio_b64.c libcrypto_la_SOURCES += evp/bio_enc.c libcrypto_la_SOURCES += evp/bio_md.c libcrypto_la_SOURCES += evp/e_aes.c -libcrypto_la_SOURCES += evp/e_aes_cbc_hmac_sha1.c libcrypto_la_SOURCES += evp/e_bf.c libcrypto_la_SOURCES += evp/e_camellia.c libcrypto_la_SOURCES += evp/e_cast.c @@ -609,12 +610,10 @@ libcrypto_la_SOURCES += evp/e_chacha.c libcrypto_la_SOURCES += evp/e_chacha20poly1305.c libcrypto_la_SOURCES += evp/e_des.c libcrypto_la_SOURCES += evp/e_des3.c -libcrypto_la_SOURCES += evp/e_gost2814789.c libcrypto_la_SOURCES += evp/e_idea.c libcrypto_la_SOURCES += evp/e_null.c libcrypto_la_SOURCES += evp/e_rc2.c libcrypto_la_SOURCES += evp/e_rc4.c -libcrypto_la_SOURCES += evp/e_rc4_hmac_md5.c libcrypto_la_SOURCES += evp/e_sm4.c libcrypto_la_SOURCES += evp/e_xcbc_d.c libcrypto_la_SOURCES += evp/evp_aead.c @@ -626,8 +625,6 @@ libcrypto_la_SOURCES += evp/evp_key.c libcrypto_la_SOURCES += evp/evp_names.c libcrypto_la_SOURCES += evp/evp_pbe.c libcrypto_la_SOURCES += evp/evp_pkey.c -libcrypto_la_SOURCES += evp/m_gost2814789.c -libcrypto_la_SOURCES += evp/m_gostr341194.c libcrypto_la_SOURCES += evp/m_md4.c libcrypto_la_SOURCES += evp/m_md5.c libcrypto_la_SOURCES += evp/m_md5_sha1.c @@ -636,7 +633,6 @@ libcrypto_la_SOURCES += evp/m_ripemd.c libcrypto_la_SOURCES += evp/m_sha1.c libcrypto_la_SOURCES += evp/m_sha3.c libcrypto_la_SOURCES += evp/m_sigver.c -libcrypto_la_SOURCES += evp/m_streebog.c libcrypto_la_SOURCES += evp/m_sm3.c libcrypto_la_SOURCES += evp/m_wp.c libcrypto_la_SOURCES += evp/p_legacy.c @@ -648,24 +644,6 @@ libcrypto_la_SOURCES += evp/pmeth_gn.c libcrypto_la_SOURCES += evp/pmeth_lib.c noinst_HEADERS += evp/evp_local.h -# gost -libcrypto_la_SOURCES += gost/gost2814789.c -libcrypto_la_SOURCES += gost/gost89_keywrap.c -libcrypto_la_SOURCES += gost/gost89_params.c -libcrypto_la_SOURCES += gost/gost89imit_ameth.c -libcrypto_la_SOURCES += gost/gost89imit_pmeth.c -libcrypto_la_SOURCES += gost/gost_asn1.c -libcrypto_la_SOURCES += gost/gost_err.c -libcrypto_la_SOURCES += gost/gostr341001.c -libcrypto_la_SOURCES += gost/gostr341001_ameth.c -libcrypto_la_SOURCES += gost/gostr341001_key.c -libcrypto_la_SOURCES += gost/gostr341001_params.c -libcrypto_la_SOURCES += gost/gostr341001_pmeth.c -libcrypto_la_SOURCES += gost/gostr341194.c -libcrypto_la_SOURCES += gost/streebog.c -noinst_HEADERS += gost/gost_asn1.h -noinst_HEADERS += gost/gost_local.h - # hidden noinst_HEADERS += hidden/crypto_namespace.h noinst_HEADERS += hidden/openssl/asn1.h @@ -685,7 +663,6 @@ noinst_HEADERS += hidden/openssl/dh.h noinst_HEADERS += hidden/openssl/dsa.h noinst_HEADERS += hidden/openssl/ec.h noinst_HEADERS += hidden/openssl/err.h -noinst_HEADERS += hidden/openssl/gost.h noinst_HEADERS += hidden/openssl/hkdf.h noinst_HEADERS += hidden/openssl/hmac.h noinst_HEADERS += hidden/openssl/idea.h @@ -736,8 +713,8 @@ libcrypto_la_SOURCES += kdf/hkdf_evp.c libcrypto_la_SOURCES += kdf/kdf_err.c # lhash -libcrypto_la_SOURCES += lhash/lh_stats.c libcrypto_la_SOURCES += lhash/lhash.c +noinst_HEADERS += lhash/lhash_local.h # md4 libcrypto_la_SOURCES += md4/md4.c @@ -874,6 +851,7 @@ libcrypto_la_SOURCES += sm4/sm4.c # stack libcrypto_la_SOURCES += stack/stack.c +noinst_HEADERS += stack/stack_local.h # ts libcrypto_la_SOURCES += ts/ts_asn1.c diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4923cc1..714f331 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -415,11 +415,6 @@ add_executable(gcm128test gcm128test.c) target_link_libraries(gcm128test ${OPENSSL_TEST_LIBS}) add_test(gcm128test gcm128test) -# gost2814789t -add_executable(gost2814789t gost2814789t.c) -target_link_libraries(gost2814789t ${OPENSSL_TEST_LIBS}) -add_test(gost2814789t gost2814789t) - # handshake_table add_executable(handshake_table handshake_table.c) target_link_libraries(handshake_table ${OPENSSL_TEST_LIBS}) diff --git a/tests/Makefile.am b/tests/Makefile.am index bd119fb..e0e5a32 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -434,11 +434,6 @@ TESTS += gcm128test check_PROGRAMS += gcm128test gcm128test_SOURCES = gcm128test.c -# gost2814789t -TESTS += gost2814789t -check_PROGRAMS += gost2814789t -gost2814789t_SOURCES = gost2814789t.c - # handshake_table TESTS += handshake_table check_PROGRAMS += handshake_table diff --git a/update.sh b/update.sh index 4fd1ab2..95d852c 100755 --- a/update.sh +++ b/update.sh @@ -139,7 +139,7 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h md4/md4.h ripemd/ripemd.h whrlpool/whrlpool.h idea/idea.h rc2/rc2.h rc4/rc4.h ui/ui_compat.h txt_db/txt_db.h sm3/sm3.h sm4/sm4.h chacha/chacha.h evp/evp.h poly1305/poly1305.h - camellia/camellia.h gost/gost.h curve25519/curve25519.h + camellia/camellia.h curve25519/curve25519.h ct/ct.h kdf/kdf.h" copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h" -- cgit v1.2.3-55-g6feb