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

build updates

Browse Source
This commit is contained in:
Brent Cook 2021-11-08 07:33:50 -06:00
parent 0319bb7edb
commit 04ab1061f3
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/CMakeLists.txt
View File

@ -1,3 +1,5 @@
add_definitions(-DLIBRESSL_CRYPTO_INTERNAL)
if(HOST_ASM_ELF_ARMV4) if(HOST_ASM_ELF_ARMV4)
set( set(
ASM_ARMV4_ELF_SRC ASM_ARMV4_ELF_SRC
@ -726,9 +728,11 @@ set(
x509/pcy_map.c x509/pcy_map.c
x509/pcy_node.c x509/pcy_node.c
x509/pcy_tree.c x509/pcy_tree.c
x509/x509_addr.c
x509/x509_akey.c x509/x509_akey.c
x509/x509_akeya.c x509/x509_akeya.c
x509/x509_alt.c x509/x509_alt.c
x509/x509_asid.c
x509/x509_att.c x509/x509_att.c
x509/x509_bcons.c x509/x509_bcons.c
x509/x509_bitst.c x509/x509_bitst.c
@ -982,6 +986,7 @@ target_include_directories(crypto_obj
ecdsa ecdsa
evp evp
modes modes
x509
../include/compat ../include/compat
PUBLIC PUBLIC
../include) ../include)
@ -998,6 +1003,7 @@ target_include_directories(crypto
ecdsa ecdsa
evp evp
modes modes
x509
../include/compat ../include/compat
PUBLIC PUBLIC
../include) ../include)

1
crypto/Makefile.am
View File

@ -7,6 +7,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/crypto/ecdh
AM_CPPFLAGS += -I$(top_srcdir)/crypto/ecdsa AM_CPPFLAGS += -I$(top_srcdir)/crypto/ecdsa
AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp
AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes
AM_CPPFLAGS += -I$(top_srcdir)/crypto/x509
AM_CPPFLAGS += -I$(top_srcdir)/crypto AM_CPPFLAGS += -I$(top_srcdir)/crypto
noinst_LTLIBRARIES = libcompat.la noinst_LTLIBRARIES = libcompat.la

2
ssl/CMakeLists.txt
View File

@ -36,11 +36,11 @@ set(
ssl_versions.c ssl_versions.c
t1_enc.c t1_enc.c
t1_lib.c t1_lib.c
tls_buffer.c
tls_content.c tls_content.c
tls12_key_schedule.c tls12_key_schedule.c
tls12_lib.c tls12_lib.c
tls12_record_layer.c tls12_record_layer.c
tls13_buffer.c
tls13_client.c tls13_client.c
tls13_error.c tls13_error.c
tls13_handshake.c tls13_handshake.c

3
ssl/Makefile.am
View File

@ -58,11 +58,11 @@ libssl_la_SOURCES += ssl_txt.c
libssl_la_SOURCES += ssl_versions.c libssl_la_SOURCES += ssl_versions.c
libssl_la_SOURCES += t1_enc.c libssl_la_SOURCES += t1_enc.c
libssl_la_SOURCES += t1_lib.c libssl_la_SOURCES += t1_lib.c
libssl_la_SOURCES += tls_buffer.c
libssl_la_SOURCES += tls_content.c libssl_la_SOURCES += tls_content.c
libssl_la_SOURCES += tls12_key_schedule.c libssl_la_SOURCES += tls12_key_schedule.c
libssl_la_SOURCES += tls12_lib.c libssl_la_SOURCES += tls12_lib.c
libssl_la_SOURCES += tls12_record_layer.c libssl_la_SOURCES += tls12_record_layer.c
libssl_la_SOURCES += tls13_buffer.c
libssl_la_SOURCES += tls13_client.c libssl_la_SOURCES += tls13_client.c
libssl_la_SOURCES += tls13_error.c libssl_la_SOURCES += tls13_error.c
libssl_la_SOURCES += tls13_handshake.c libssl_la_SOURCES += tls13_handshake.c
@ -82,6 +82,7 @@ noinst_HEADERS += ssl_locl.h
noinst_HEADERS += ssl_sigalgs.h noinst_HEADERS += ssl_sigalgs.h
noinst_HEADERS += ssl_tlsext.h noinst_HEADERS += ssl_tlsext.h
noinst_HEADERS += tls_content.h noinst_HEADERS += tls_content.h
noinst_HEADERS += tls_internal.h
noinst_HEADERS += tls13_internal.h noinst_HEADERS += tls13_internal.h
noinst_HEADERS += tls13_handshake.h noinst_HEADERS += tls13_handshake.h
noinst_HEADERS += tls13_record.h noinst_HEADERS += tls13_record.h

3
tests/CMakeLists.txt
View File

@ -4,7 +4,6 @@ include_directories(
../crypto/asn1 ../crypto/asn1
../crypto/x509 ../crypto/x509
../ssl ../ssl
../tls
../apps/openssl ../apps/openssl
../apps/openssl/compat ../apps/openssl/compat
../include/compat ../include/compat
@ -284,6 +283,7 @@ if(NOT BUILD_SHARED_LIBS)
add_executable(keypairtest keypairtest.c) add_executable(keypairtest keypairtest.c)
target_link_libraries(keypairtest ${LIBTLS_LIBS}) target_link_libraries(keypairtest ${LIBTLS_LIBS})
target_include_directories(keypairtest BEFORE PUBLIC ../tls)
add_test(keypairtest keypairtest add_test(keypairtest keypairtest
${CMAKE_CURRENT_SOURCE_DIR}/ca.pem ${CMAKE_CURRENT_SOURCE_DIR}/ca.pem
${CMAKE_CURRENT_SOURCE_DIR}/server.pem ${CMAKE_CURRENT_SOURCE_DIR}/server.pem
@ -595,4 +595,3 @@ if(BUILD_SHARED_LIBS)
"${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
COMMENT "Copying DLLs for regression tests") COMMENT "Copying DLLs for regression tests")
endif() endif()

3
tests/Makefile.am
View File

@ -4,7 +4,6 @@ AM_CPPFLAGS += -I $(top_srcdir)/crypto/modes
AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1 AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1
AM_CPPFLAGS += -I $(top_srcdir)/crypto/x509 AM_CPPFLAGS += -I $(top_srcdir)/crypto/x509
AM_CPPFLAGS += -I $(top_srcdir)/ssl AM_CPPFLAGS += -I $(top_srcdir)/ssl
AM_CPPFLAGS += -I $(top_srcdir)/tls
AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl
AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat
AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/apps/openssl/cert.pem\" AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/apps/openssl/cert.pem\"
@ -101,7 +100,6 @@ bn_to_string_SOURCES = bn_to_string.c
# buffertest # buffertest
TESTS += buffertest TESTS += buffertest
buffertest_CPPFLAGS = $(AM_CPPFLAGS)
check_PROGRAMS += buffertest check_PROGRAMS += buffertest
buffertest_SOURCES = buffertest.c buffertest_SOURCES = buffertest.c
@ -272,6 +270,7 @@ igetest_SOURCES = igetest.c
# keypairtest # keypairtest
TESTS += keypairtest.sh TESTS += keypairtest.sh
keypairtest_CPPFLAGS = -I $(top_srcdir)/tls
check_PROGRAMS += keypairtest check_PROGRAMS += keypairtest
keypairtest_SOURCES = keypairtest.c keypairtest_SOURCES = keypairtest.c
EXTRA_DIST += keypairtest.sh EXTRA_DIST += keypairtest.sh