diff options
| author | Tharanga Gamaethige <tgamaethige@netflix.com> | 2018-11-30 17:44:33 -0800 |
|---|---|---|
| committer | dormando <dormando@rydia.net> | 2019-04-15 21:36:18 -0700 |
| commit | ee1cfe3bf9384d1a93545fc942e25bed6437d910 (patch) | |
| tree | 2e880ddd3d263b85f2cf6de73b8eb15d14d02e37 /Makefile.am | |
| parent | d2dcfff7edd28baf3587ab103d6fbac322335a68 (diff) | |
| download | memcached-ee1cfe3bf9384d1a93545fc942e25bed6437d910.tar.gz | |
Basic implementation of TLS for memcached.1.5.13
Most of the work done by Tharanga. Some commits squashed in by
dormando. Also reviewed by dormando.
Tested, working, but experimental implementation of TLS for memcached.
Enable with ./configure --enable-tls
Requires OpenSSL 1.1.0 or better.
See `memcached -h` output for usage.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 22ea696..594c794 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,10 @@ memcached_SOURCES += extstore.c extstore.h \ slab_automove_extstore.c slab_automove_extstore.h endif +if ENABLE_TLS +memcached_SOURCES += tls.c tls.h +endif + memcached_debug_SOURCES = $(memcached_SOURCES) memcached_CPPFLAGS = -DNDEBUG memcached_debug_LDADD = @PROFILER_LDFLAGS@ @@ -102,9 +106,29 @@ EXTRA_DIST = doc scripts t memcached.spec memcached_dtrace.d version.m4 README.m MOSTLYCLEANFILES = *.gcov *.gcno *.gcda *.tcov +if ENABLE_TLS +test_tls: + $(MAKE) SSL_TEST=1 test + +test_basic_tls: + @if test $(SSL_TEST)1 != 1; then \ + echo "Running basic tests with TLS"; \ + $(srcdir)/testapp; \ + prove $(srcdir)/t/binary.t $(srcdir)/t/getset.t $(srcdir)/t/ssl*; \ + echo "Finished running basic TLS tests"; \ + else \ + echo "Set SSL_TEST=1 to enable TLS tests"; \ + fi +endif + test: memcached-debug sizes testapp $(srcdir)/sizes $(srcdir)/testapp +if ENABLE_TLS + @if test $(SSL_TEST)1 = 1; then \ + $(MAKE) SSL_TEST=1 test_basic_tls; \ + fi +endif @if test -n "${PARALLEL}"; then \ prove $(srcdir)/t -j ${PARALLEL}; \ else \ |