diff options
author | Brent Cook <busterb@gmail.com> | 2019-01-18 17:13:36 -0600 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2019-01-18 17:13:36 -0600 |
commit | e59ea94f623ff6e1aea79589228fcdebe809c97b (patch) | |
tree | ae694fd23dc3437667e6d9fba4084ea1dcd36676 | |
parent | 7032d88bfd6a28e9ea72b08d14feb5775def3e2f (diff) | |
download | portable-e59ea94f623ff6e1aea79589228fcdebe809c97b.tar.gz portable-e59ea94f623ff6e1aea79589228fcdebe809c97b.tar.bz2 portable-e59ea94f623ff6e1aea79589228fcdebe809c97b.zip |
add tls13_[tlsext|buffer].* and buffertest
-rw-r--r-- | ssl/CMakeLists.txt | 2 | ||||
-rw-r--r-- | ssl/Makefile.am | 3 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/Makefile.am | 6 |
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 | ||
44 | add_library(ssl ${SSL_SRC}) | 46 | 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 | |||
46 | libssl_la_SOURCES += t1_enc.c | 46 | libssl_la_SOURCES += t1_enc.c |
47 | libssl_la_SOURCES += t1_hash.c | 47 | libssl_la_SOURCES += t1_hash.c |
48 | libssl_la_SOURCES += t1_lib.c | 48 | libssl_la_SOURCES += t1_lib.c |
49 | libssl_la_SOURCES += tls13_buffer.c | ||
49 | libssl_la_SOURCES += tls13_handshake.c | 50 | libssl_la_SOURCES += tls13_handshake.c |
50 | libssl_la_SOURCES += tls13_key_schedule.c | 51 | libssl_la_SOURCES += tls13_key_schedule.c |
52 | libssl_la_SOURCES += tls13_tlsext.c | ||
51 | 53 | ||
52 | noinst_HEADERS = bytestring.h | 54 | noinst_HEADERS = bytestring.h |
53 | noinst_HEADERS += srtp.h | 55 | noinst_HEADERS += srtp.h |
@@ -55,3 +57,4 @@ noinst_HEADERS += ssl_locl.h | |||
55 | noinst_HEADERS += ssl_sigalgs.h | 57 | noinst_HEADERS += ssl_sigalgs.h |
56 | noinst_HEADERS += ssl_tlsext.h | 58 | noinst_HEADERS += ssl_tlsext.h |
57 | noinst_HEADERS += tls13_internal.h | 59 | noinst_HEADERS += tls13_internal.h |
60 | 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) | |||
85 | add_test(bntest bntest) | 85 | add_test(bntest bntest) |
86 | endif() | 86 | endif() |
87 | 87 | ||
88 | # buffertest | ||
89 | if(NOT BUILD_SHARED_LIBS) | ||
90 | add_executable(buffertest buffertest.c) | ||
91 | target_link_libraries(buffertest ${OPENSSL_LIBS}) | ||
92 | add_test(buffertest buffertest) | ||
93 | endif() | ||
94 | |||
88 | # bytestringtest | 95 | # bytestringtest |
89 | if(NOT BUILD_SHARED_LIBS) | 96 | if(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 | |||
93 | check_PROGRAMS += bntest | 93 | check_PROGRAMS += bntest |
94 | bntest_SOURCES = bntest.c | 94 | bntest_SOURCES = bntest.c |
95 | 95 | ||
96 | # buffertest | ||
97 | TESTS += buffertest | ||
98 | buffertest_CPPFLAGS = $(AM_CPPFLAGS) | ||
99 | check_PROGRAMS += buffertest | ||
100 | buffertest_SOURCES = buffertest.c | ||
101 | |||
96 | # bytestringtest | 102 | # bytestringtest |
97 | TESTS += bytestringtest | 103 | TESTS += bytestringtest |
98 | check_PROGRAMS += bytestringtest | 104 | check_PROGRAMS += bytestringtest |