6 files changed, 12 insertions, 6 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index b1ded85..b01afa9 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_definitions(-DLIBRESSL_CRYPTO_INTERNAL)
+
 if(HOST_ASM_ELF_ARMV4)
         set(
                 ASM_ARMV4_ELF_SRC
@@ -726,9 +728,11 @@ set(
         x509/pcy_map.c
         x509/pcy_node.c
         x509/pcy_tree.c
+        x509/x509_addr.c
         x509/x509_akey.c
         x509/x509_akeya.c
         x509/x509_alt.c
+        x509/x509_asid.c
         x509/x509_att.c
         x509/x509_bcons.c
         x509/x509_bitst.c
@@ -982,6 +986,7 @@ target_include_directories(crypto_obj
                 ecdsa
                 evp
                 modes
+                x509
                 ../include/compat
         PUBLIC
                 ../include)
@@ -998,6 +1003,7 @@ target_include_directories(crypto
                 ecdsa
                 evp
                 modes
+                x509
                 ../include/compat
         PUBLIC
                 ../include)
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 4030eae..35148e3 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -7,6 +7,7 @@ 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/modes
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/x509
 AM_CPPFLAGS += -I$(top_srcdir)/crypto
 
 noinst_LTLIBRARIES = libcompat.la
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index a772d12..a8e0a25 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -36,11 +36,11 @@ set(
         ssl_versions.c
         t1_enc.c
         t1_lib.c
+        tls_buffer.c
         tls_content.c
         tls12_key_schedule.c
         tls12_lib.c
         tls12_record_layer.c
-        tls13_buffer.c
         tls13_client.c
         tls13_error.c
         tls13_handshake.c
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index f266122..d12928e 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -58,11 +58,11 @@ libssl_la_SOURCES += ssl_txt.c
 libssl_la_SOURCES += ssl_versions.c
 libssl_la_SOURCES += t1_enc.c
 libssl_la_SOURCES += t1_lib.c
+libssl_la_SOURCES += tls_buffer.c
 libssl_la_SOURCES += tls_content.c
 libssl_la_SOURCES += tls12_key_schedule.c
 libssl_la_SOURCES += tls12_lib.c
 libssl_la_SOURCES += tls12_record_layer.c
-libssl_la_SOURCES += tls13_buffer.c
 libssl_la_SOURCES += tls13_client.c
 libssl_la_SOURCES += tls13_error.c
 libssl_la_SOURCES += tls13_handshake.c
@@ -82,6 +82,7 @@ noinst_HEADERS += ssl_locl.h
 noinst_HEADERS += ssl_sigalgs.h
 noinst_HEADERS += ssl_tlsext.h
 noinst_HEADERS += tls_content.h
+noinst_HEADERS += tls_internal.h
 noinst_HEADERS += tls13_internal.h
 noinst_HEADERS += tls13_handshake.h
 noinst_HEADERS += tls13_record.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index efe5126..f0df7b0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
         ../crypto/asn1
         ../crypto/x509
         ../ssl
-        ../tls
         ../apps/openssl
         ../apps/openssl/compat
         ../include/compat
@@ -284,6 +283,7 @@ if(NOT BUILD_SHARED_LIBS)
 
         add_executable(keypairtest keypairtest.c)
         target_link_libraries(keypairtest ${LIBTLS_LIBS})
+        target_include_directories(keypairtest BEFORE PUBLIC ../tls)
         add_test(keypairtest keypairtest
                 ${CMAKE_CURRENT_SOURCE_DIR}/ca.pem
                 ${CMAKE_CURRENT_SOURCE_DIR}/server.pem
@@ -595,4 +595,3 @@ if(BUILD_SHARED_LIBS)
                 "${CMAKE_CURRENT_BINARY_DIR}"
                 COMMENT "Copying DLLs for regression tests")
 endif()
-
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f43bd85..f1086b3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS += -I $(top_srcdir)/crypto/modes
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/x509
 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/compat
 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
 TESTS += buffertest
-buffertest_CPPFLAGS = $(AM_CPPFLAGS)
 check_PROGRAMS += buffertest
 buffertest_SOURCES = buffertest.c
 
@@ -272,6 +270,7 @@ igetest_SOURCES = igetest.c
 
 # keypairtest
 TESTS += keypairtest.sh
+keypairtest_CPPFLAGS = -I $(top_srcdir)/tls
 check_PROGRAMS += keypairtest
 keypairtest_SOURCES = keypairtest.c
 EXTRA_DIST += keypairtest.sh