From e59ea94f623ff6e1aea79589228fcdebe809c97b Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 18 Jan 2019 17:13:36 -0600 Subject: add tls13_[tlsext|buffer].* and buffertest --- ssl/CMakeLists.txt | 2 ++ ssl/Makefile.am | 3 +++ tests/CMakeLists.txt | 7 +++++++ tests/Makefile.am | 6 ++++++ 4 files changed, 18 insertions(+) diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index 911d6bc..219d081 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -37,8 +37,10 @@ set( t1_enc.c t1_hash.c t1_lib.c + tls13_buffer.c tls13_handshake.c tls13_key_schedule.c + tls13_tlsext.c ) add_library(ssl ${SSL_SRC}) diff --git a/ssl/Makefile.am b/ssl/Makefile.am index 4cc1d1d..ffbfc2f 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am @@ -46,8 +46,10 @@ libssl_la_SOURCES += ssl_versions.c libssl_la_SOURCES += t1_enc.c libssl_la_SOURCES += t1_hash.c libssl_la_SOURCES += t1_lib.c +libssl_la_SOURCES += tls13_buffer.c libssl_la_SOURCES += tls13_handshake.c libssl_la_SOURCES += tls13_key_schedule.c +libssl_la_SOURCES += tls13_tlsext.c noinst_HEADERS = bytestring.h noinst_HEADERS += srtp.h @@ -55,3 +57,4 @@ noinst_HEADERS += ssl_locl.h noinst_HEADERS += ssl_sigalgs.h noinst_HEADERS += ssl_tlsext.h noinst_HEADERS += tls13_internal.h +noinst_HEADERS += tls13_tlsext.h diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d3113ab..8d2b73a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -85,6 +85,13 @@ if(NOT BUILD_SHARED_LIBS) add_test(bntest bntest) endif() +# buffertest +if(NOT BUILD_SHARED_LIBS) + add_executable(buffertest buffertest.c) + target_link_libraries(buffertest ${OPENSSL_LIBS}) + add_test(buffertest buffertest) +endif() + # bytestringtest if(NOT BUILD_SHARED_LIBS) add_executable(bytestringtest bytestringtest.c) diff --git a/tests/Makefile.am b/tests/Makefile.am index 256eb44..e1879ad 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -93,6 +93,12 @@ bntest_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL check_PROGRAMS += bntest bntest_SOURCES = bntest.c +# buffertest +TESTS += buffertest +buffertest_CPPFLAGS = $(AM_CPPFLAGS) +check_PROGRAMS += buffertest +buffertest_SOURCES = buffertest.c + # bytestringtest TESTS += bytestringtest check_PROGRAMS += bytestringtest -- cgit v1.2.3-55-g6feb