factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build

Browse Source 
- 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
This commit is contained in:
kinichiro 2022-01-14 21:44:08 +09:00
parent 5372a1c07a
commit ea53dcd569
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/CMakeLists.txt
View File

@ -273,7 +273,6 @@ set(
asn1/asn_moid.c asn1/asn_moid.c
asn1/bio_asn1.c asn1/bio_asn1.c
asn1/bio_ndef.c asn1/bio_ndef.c
asn1/n_pkey.c
asn1/nsseq.c asn1/nsseq.c
asn1/p5_pbe.c asn1/p5_pbe.c
asn1/p5_pbev2.c asn1/p5_pbev2.c
@ -299,7 +298,6 @@ set(
asn1/x_info.c asn1/x_info.c
asn1/x_long.c asn1/x_long.c
asn1/x_name.c asn1/x_name.c
asn1/x_nx509.c
asn1/x_pkey.c asn1/x_pkey.c
asn1/x_pubkey.c asn1/x_pubkey.c
asn1/x_req.c asn1/x_req.c
@ -556,9 +554,6 @@ set(
evp/evp_lib.c evp/evp_lib.c
evp/evp_pbe.c evp/evp_pbe.c
evp/evp_pkey.c evp/evp_pkey.c
evp/m_dss.c
evp/m_dss1.c
evp/m_ecdsa.c
evp/m_gost2814789.c evp/m_gost2814789.c
evp/m_gostr341194.c evp/m_gostr341194.c
evp/m_md4.c evp/m_md4.c
@ -642,7 +637,6 @@ set(
pem/pem_oth.c pem/pem_oth.c
pem/pem_pk8.c pem/pem_pk8.c
pem/pem_pkey.c pem/pem_pkey.c
pem/pem_seal.c
pem/pem_sign.c pem/pem_sign.c
pem/pem_x509.c pem/pem_x509.c
pem/pem_xaux.c pem/pem_xaux.c

6
crypto/Makefile.am
View File

@ -332,7 +332,6 @@ libcrypto_la_SOURCES += asn1/asn_mime.c
libcrypto_la_SOURCES += asn1/asn_moid.c libcrypto_la_SOURCES += asn1/asn_moid.c
libcrypto_la_SOURCES += asn1/bio_asn1.c libcrypto_la_SOURCES += asn1/bio_asn1.c
libcrypto_la_SOURCES += asn1/bio_ndef.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/nsseq.c
libcrypto_la_SOURCES += asn1/p5_pbe.c libcrypto_la_SOURCES += asn1/p5_pbe.c
libcrypto_la_SOURCES += asn1/p5_pbev2.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_info.c
libcrypto_la_SOURCES += asn1/x_long.c libcrypto_la_SOURCES += asn1/x_long.c
libcrypto_la_SOURCES += asn1/x_name.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_pkey.c
libcrypto_la_SOURCES += asn1/x_pubkey.c libcrypto_la_SOURCES += asn1/x_pubkey.c
libcrypto_la_SOURCES += asn1/x_req.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_lib.c
libcrypto_la_SOURCES += evp/evp_pbe.c libcrypto_la_SOURCES += evp/evp_pbe.c
libcrypto_la_SOURCES += evp/evp_pkey.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_gost2814789.c
libcrypto_la_SOURCES += evp/m_gostr341194.c libcrypto_la_SOURCES += evp/m_gostr341194.c
libcrypto_la_SOURCES += evp/m_md4.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_oth.c
libcrypto_la_SOURCES += pem/pem_pk8.c libcrypto_la_SOURCES += pem/pem_pk8.c
libcrypto_la_SOURCES += pem/pem_pkey.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_sign.c
libcrypto_la_SOURCES += pem/pem_x509.c libcrypto_la_SOURCES += pem/pem_x509.c
libcrypto_la_SOURCES += pem/pem_xaux.c libcrypto_la_SOURCES += pem/pem_xaux.c

1
ssl/CMakeLists.txt
View File

@ -62,6 +62,7 @@ add_library(ssl_obj OBJECT ${SSL_SRC})
target_include_directories(ssl_obj target_include_directories(ssl_obj
PRIVATE PRIVATE
. .
../crypto/bio
../include/compat ../include/compat
PUBLIC PUBLIC
../include) ../include)

2
ssl/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
AM_CPPFLAGS += -I$(top_srcdir)/crypto/bio
noinst_LTLIBRARIES = libbs.la noinst_LTLIBRARIES = libbs.la
if ENABLE_LIBTLS_ONLY if ENABLE_LIBTLS_ONLY