Merge pull request #90 from yossigo/tls

TLS Support

Author: yossigo

Makefile.am

@@ -23,7 +23,11 @@ bin_PROGRAMS = memtier_benchmark
 completionsdir=$(BASH_COMPLETION_DIR)
 completions_DATA=bash-completion/memtier_benchmark
 
-memtier_benchmark_CPPFLAGS = $(LIBEVENT_CFLAGS)
+memtier_benchmark_CPPFLAGS = \
+	$(LIBEVENT_CFLAGS) \
+	$(LIBEVENT_OPENSSL_CFLAGS) \
+	$(LIBCRYPTO_CFLAGS) \
+	$(LIBSSL_CFLAGS)
 memtier_benchmark_SOURCES = \
 	memtier_benchmark.cpp memtier_benchmark.h \
 	client.cpp client.h \
@@ -37,7 +41,11 @@ memtier_benchmark_SOURCES = \
 	item.cpp item.h \
 	file_io.cpp file_io.h \
 	config_types.cpp config_types.h
-memtier_benchmark_LDADD = $(LIBEVENT_LIBS)
+memtier_benchmark_LDADD = \
+	$(LIBEVENT_LIBS) \
+	$(LIBEVENT_OPENSSL_LIBS) \
+	$(LIBCRYPTO_LIBS) \
+	$(LIBSSL_LIBS)
 
 dist_man1_MANS = memtier_benchmark.1
 

README.md

@@ -10,6 +10,7 @@ memtier_benchmark is a command line utility developed by Redis Labs (formerly Ga
  * Random and sequential key name pattern policies
  * Random or ranged key expiration
  * Redis cluster
+ * TLS support
  * ...and much more
 
 Read more at:
@@ -25,6 +26,7 @@ The following libraries are required for building:
 
 * libevent 2.0.10 or newer.
 * libpcre 8.x.
+* OpenSSL (unless TLS support is disabled by `./configure --disable-tls`).
 
 The following tools are required
 * autoconf
@@ -70,7 +72,7 @@ Then proceed to follow the build instructions below.
 On Ubuntu/Debian distributions, simply install all prerequisites as follows:
 
 ```
-# apt-get install build-essential autoconf automake libpcre3-dev libevent-dev pkg-config zlib1g-dev
+# apt-get install build-essential autoconf automake libpcre3-dev libevent-dev pkg-config zlib1g-dev libssl-dev
 ```
 
 #### macOS

configure.ac

@@ -20,6 +20,7 @@ AC_INIT(memtier_benchmark,1.2.17,[email protected])
 AC_CONFIG_SRCDIR([memtier_benchmark.cpp])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
 LT_INIT
 
 CXXFLAGS="-O2 -g -Wall"
@@ -45,6 +46,25 @@ AC_FUNC_MALLOC
 AC_FUNC_MEMCMP
 AC_CHECK_FUNCS([gettimeofday memchr memset socket strerror random_r drand48])
 
+# TLS support is optional.
+AC_ARG_ENABLE([tls],
+  [AS_HELP_STRING([--disable-tls],
+                  [Disable TLS/SSL support])])
+AS_IF([test "x$enable_tls" != "xno"], [
+       AC_DEFINE([USE_TLS],
+                 [1],
+                 [define to enable TLS/SSL support])
+       PKG_CHECK_MODULES([LIBEVENT_OPENSSL],
+                         [libevent_openssl >= 2.0.10],
+                         AC_SUBST(LIBEVENT_OPENSSL_CFLAGS) AC_SUBST(LIBEVENT_OPENSSL_LIBS))
+       PKG_CHECK_MODULES([LIBSSL],
+                         [libssl],
+                         AC_SUBST(LIBSSL_CFLAGS) AC_SUBST(LIBSSL_LIBS))
+       PKG_CHECK_MODULES([LIBCRYPTO],
+                         [libcrypto],
+                         AC_SUBST(LIBCRYPTO_CFLAGS) AC_SUBST(LIBCRYPTO_LIBS))
+       ], [])
+
 # clock_gettime requires -lrt on old glibc only.
 AC_SEARCH_LIBS([clock_gettime], [rt], , AC_MSG_ERROR([rt is required libevent.]))