aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2019-01-18 17:13:36 -0600
committerBrent Cook <busterb@gmail.com>2019-01-18 17:13:36 -0600
commite59ea94f623ff6e1aea79589228fcdebe809c97b (patch)
treeae694fd23dc3437667e6d9fba4084ea1dcd36676
parent7032d88bfd6a28e9ea72b08d14feb5775def3e2f (diff)
downloadportable-e59ea94f623ff6e1aea79589228fcdebe809c97b.tar.gz
portable-e59ea94f623ff6e1aea79589228fcdebe809c97b.tar.bz2
portable-e59ea94f623ff6e1aea79589228fcdebe809c97b.zip
add tls13_[tlsext|buffer].* and buffertest
-rw-r--r--ssl/CMakeLists.txt2
-rw-r--r--ssl/Makefile.am3
-rw-r--r--tests/CMakeLists.txt7
-rw-r--r--tests/Makefile.am6
4 files changed, 18 insertions, 0 deletions
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(
37 t1_enc.c 37 t1_enc.c
38 t1_hash.c 38 t1_hash.c
39 t1_lib.c 39 t1_lib.c
40 tls13_buffer.c
40 tls13_handshake.c 41 tls13_handshake.c
41 tls13_key_schedule.c 42 tls13_key_schedule.c
43 tls13_tlsext.c
42) 44)
43 45
44add_library(ssl ${SSL_SRC}) 46add_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
46libssl_la_SOURCES += t1_enc.c 46libssl_la_SOURCES += t1_enc.c
47libssl_la_SOURCES += t1_hash.c 47libssl_la_SOURCES += t1_hash.c
48libssl_la_SOURCES += t1_lib.c 48libssl_la_SOURCES += t1_lib.c
49libssl_la_SOURCES += tls13_buffer.c
49libssl_la_SOURCES += tls13_handshake.c 50libssl_la_SOURCES += tls13_handshake.c
50libssl_la_SOURCES += tls13_key_schedule.c 51libssl_la_SOURCES += tls13_key_schedule.c
52libssl_la_SOURCES += tls13_tlsext.c
51 53
52noinst_HEADERS = bytestring.h 54noinst_HEADERS = bytestring.h
53noinst_HEADERS += srtp.h 55noinst_HEADERS += srtp.h
@@ -55,3 +57,4 @@ noinst_HEADERS += ssl_locl.h
55noinst_HEADERS += ssl_sigalgs.h 57noinst_HEADERS += ssl_sigalgs.h
56noinst_HEADERS += ssl_tlsext.h 58noinst_HEADERS += ssl_tlsext.h
57noinst_HEADERS += tls13_internal.h 59noinst_HEADERS += tls13_internal.h
60noinst_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)
85 add_test(bntest bntest) 85 add_test(bntest bntest)
86endif() 86endif()
87 87
88# buffertest
89if(NOT BUILD_SHARED_LIBS)
90 add_executable(buffertest buffertest.c)
91 target_link_libraries(buffertest ${OPENSSL_LIBS})
92 add_test(buffertest buffertest)
93endif()
94
88# bytestringtest 95# bytestringtest
89if(NOT BUILD_SHARED_LIBS) 96if(NOT BUILD_SHARED_LIBS)
90 add_executable(bytestringtest bytestringtest.c) 97 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
93check_PROGRAMS += bntest 93check_PROGRAMS += bntest
94bntest_SOURCES = bntest.c 94bntest_SOURCES = bntest.c
95 95
96# buffertest
97TESTS += buffertest
98buffertest_CPPFLAGS = $(AM_CPPFLAGS)
99check_PROGRAMS += buffertest
100buffertest_SOURCES = buffertest.c
101
96# bytestringtest 102# bytestringtest
97TESTS += bytestringtest 103TESTS += bytestringtest
98check_PROGRAMS += bytestringtest 104check_PROGRAMS += bytestringtest