diff options
| author | Brent Cook <bcook@rapid7.com> | 2017-07-17 05:12:55 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@rapid7.com> | 2017-07-17 05:12:55 -0500 |
| commit | 58ba8785fb364794bf3e0c1dcafd40b747188395 (patch) | |
| tree | d86d236940526595b997efb9e050fe06696b6d78 | |
| parent | e53af8da67a39de8356bf7c555008a4d20946323 (diff) | |
| download | portable-58ba8785fb364794bf3e0c1dcafd40b747188395.tar.gz portable-58ba8785fb364794bf3e0c1dcafd40b747188395.tar.bz2 portable-58ba8785fb364794bf3e0c1dcafd40b747188395.zip | |
add tlsext
| -rw-r--r-- | ssl/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ssl/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 |
4 files changed, 14 insertions, 0 deletions
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index bad7276..12005c9 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt | |||
| @@ -35,6 +35,7 @@ set( | |||
| 35 | ssl_sess.c | 35 | ssl_sess.c |
| 36 | ssl_srvr.c | 36 | ssl_srvr.c |
| 37 | ssl_stat.c | 37 | ssl_stat.c |
| 38 | ssl_tlsext.c | ||
| 38 | ssl_txt.c | 39 | ssl_txt.c |
| 39 | ssl_versions.c | 40 | ssl_versions.c |
| 40 | t1_clnt.c | 41 | t1_clnt.c |
diff --git a/ssl/Makefile.am b/ssl/Makefile.am index 3c348d3..4b52faf 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am | |||
| @@ -38,6 +38,7 @@ libssl_la_SOURCES += ssl_rsa.c | |||
| 38 | libssl_la_SOURCES += ssl_sess.c | 38 | libssl_la_SOURCES += ssl_sess.c |
| 39 | libssl_la_SOURCES += ssl_srvr.c | 39 | libssl_la_SOURCES += ssl_srvr.c |
| 40 | libssl_la_SOURCES += ssl_stat.c | 40 | libssl_la_SOURCES += ssl_stat.c |
| 41 | libssl_la_SOURCES += ssl_tlsext.c | ||
| 41 | libssl_la_SOURCES += ssl_txt.c | 42 | libssl_la_SOURCES += ssl_txt.c |
| 42 | libssl_la_SOURCES += ssl_versions.c | 43 | libssl_la_SOURCES += ssl_versions.c |
| 43 | libssl_la_SOURCES += t1_clnt.c | 44 | libssl_la_SOURCES += t1_clnt.c |
| @@ -50,4 +51,5 @@ libssl_la_SOURCES += t1_srvr.c | |||
| 50 | 51 | ||
| 51 | noinst_HEADERS = srtp.h | 52 | noinst_HEADERS = srtp.h |
| 52 | noinst_HEADERS += ssl_locl.h | 53 | noinst_HEADERS += ssl_locl.h |
| 54 | noinst_HEADERS += ssl_tlsext.h | ||
| 53 | noinst_HEADERS += bytestring.h | 55 | noinst_HEADERS += bytestring.h |
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0b68776..9341969 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt | |||
| @@ -371,6 +371,11 @@ add_executable(timingsafe timingsafe.c) | |||
| 371 | target_link_libraries(timingsafe ${TESTS_LIBS}) | 371 | target_link_libraries(timingsafe ${TESTS_LIBS}) |
| 372 | add_test(timingsafe timingsafe) | 372 | add_test(timingsafe timingsafe) |
| 373 | 373 | ||
| 374 | # tlsexttest | ||
| 375 | add_executable(tlsexttest tlsexttest.c) | ||
| 376 | target_link_libraries(tlsexttest ${TESTS_LIBS}) | ||
| 377 | add_test(tlsexttest tlsexttest) | ||
| 378 | |||
| 374 | # tlstest | 379 | # tlstest |
| 375 | set(TLSTEST_SRC tlstest.c) | 380 | set(TLSTEST_SRC tlstest.c) |
| 376 | check_function_exists(pipe2 HAVE_PIPE2) | 381 | check_function_exists(pipe2 HAVE_PIPE2) |
diff --git a/tests/Makefile.am b/tests/Makefile.am index ff2fd55..816ebc9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
| @@ -356,6 +356,12 @@ TESTS += timingsafe | |||
| 356 | check_PROGRAMS += timingsafe | 356 | check_PROGRAMS += timingsafe |
| 357 | timingsafe_SOURCES = timingsafe.c | 357 | timingsafe_SOURCES = timingsafe.c |
| 358 | 358 | ||
| 359 | # tlsexttest | ||
| 360 | TESTS += tlsexttest | ||
| 361 | check_PROGRAMS += tlsexttest | ||
| 362 | tlsexttest_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL | ||
| 363 | tlsexttest_SOURCES = tlsexttest.c | ||
| 364 | |||
| 359 | # tlstest | 365 | # tlstest |
| 360 | TESTS += tlstest.sh | 366 | TESTS += tlstest.sh |
| 361 | check_PROGRAMS += tlstest | 367 | check_PROGRAMS += tlstest |
