From ea53dcd569c3a7aed1d9ad65b520488599120ded Mon Sep 17 00:00:00 2001 From: kinichiro Date: Fri, 14 Jan 2022 21:44:08 +0900 Subject: Fix build - Remove pem/pem_seal.c asn1/x_nx509.c asn1/n_pkey.c - Remove evp/m_dss.c evp/m_dss1.c evp/m_ecdsa.c - Add include path crypto/bio to libssl for bio_local.h --- crypto/CMakeLists.txt | 6 ------ crypto/Makefile.am | 6 ------ ssl/CMakeLists.txt | 1 + ssl/Makefile.am | 2 ++ 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 4e68731..9b66d9f 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -273,7 +273,6 @@ set( asn1/asn_moid.c asn1/bio_asn1.c asn1/bio_ndef.c - asn1/n_pkey.c asn1/nsseq.c asn1/p5_pbe.c asn1/p5_pbev2.c @@ -299,7 +298,6 @@ set( asn1/x_info.c asn1/x_long.c asn1/x_name.c - asn1/x_nx509.c asn1/x_pkey.c asn1/x_pubkey.c asn1/x_req.c @@ -556,9 +554,6 @@ set( evp/evp_lib.c evp/evp_pbe.c evp/evp_pkey.c - evp/m_dss.c - evp/m_dss1.c - evp/m_ecdsa.c evp/m_gost2814789.c evp/m_gostr341194.c evp/m_md4.c @@ -642,7 +637,6 @@ set( pem/pem_oth.c pem/pem_pk8.c pem/pem_pkey.c - pem/pem_seal.c pem/pem_sign.c pem/pem_x509.c pem/pem_xaux.c diff --git a/crypto/Makefile.am b/crypto/Makefile.am index ced4ed8..0f39753 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -332,7 +332,6 @@ libcrypto_la_SOURCES += asn1/asn_mime.c libcrypto_la_SOURCES += asn1/asn_moid.c libcrypto_la_SOURCES += asn1/bio_asn1.c libcrypto_la_SOURCES += asn1/bio_ndef.c -libcrypto_la_SOURCES += asn1/n_pkey.c libcrypto_la_SOURCES += asn1/nsseq.c libcrypto_la_SOURCES += asn1/p5_pbe.c libcrypto_la_SOURCES += asn1/p5_pbev2.c @@ -358,7 +357,6 @@ libcrypto_la_SOURCES += asn1/x_exten.c libcrypto_la_SOURCES += asn1/x_info.c libcrypto_la_SOURCES += asn1/x_long.c libcrypto_la_SOURCES += asn1/x_name.c -libcrypto_la_SOURCES += asn1/x_nx509.c libcrypto_la_SOURCES += asn1/x_pkey.c libcrypto_la_SOURCES += asn1/x_pubkey.c libcrypto_la_SOURCES += asn1/x_req.c @@ -700,9 +698,6 @@ libcrypto_la_SOURCES += evp/evp_key.c libcrypto_la_SOURCES += evp/evp_lib.c libcrypto_la_SOURCES += evp/evp_pbe.c libcrypto_la_SOURCES += evp/evp_pkey.c -libcrypto_la_SOURCES += evp/m_dss.c -libcrypto_la_SOURCES += evp/m_dss1.c -libcrypto_la_SOURCES += evp/m_ecdsa.c libcrypto_la_SOURCES += evp/m_gost2814789.c libcrypto_la_SOURCES += evp/m_gostr341194.c libcrypto_la_SOURCES += evp/m_md4.c @@ -819,7 +814,6 @@ libcrypto_la_SOURCES += pem/pem_lib.c libcrypto_la_SOURCES += pem/pem_oth.c libcrypto_la_SOURCES += pem/pem_pk8.c libcrypto_la_SOURCES += pem/pem_pkey.c -libcrypto_la_SOURCES += pem/pem_seal.c libcrypto_la_SOURCES += pem/pem_sign.c libcrypto_la_SOURCES += pem/pem_x509.c libcrypto_la_SOURCES += pem/pem_xaux.c diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index a20cb04..cec2417 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -62,6 +62,7 @@ add_library(ssl_obj OBJECT ${SSL_SRC}) target_include_directories(ssl_obj PRIVATE . + ../crypto/bio ../include/compat PUBLIC ../include) diff --git a/ssl/Makefile.am b/ssl/Makefile.am index 227dfdf..7eb0ccd 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/Makefile.am.common +AM_CPPFLAGS += -I$(top_srcdir)/crypto/bio + noinst_LTLIBRARIES = libbs.la if ENABLE_LIBTLS_ONLY -- cgit v1.2.3-55-g6feb