Skip to content

Commit 755bf65

Browse files
authored
Merge pull request RedisLabs#95 from yossigo/fix/tls-builds
Fix TLS build issues.
2 parents c61592f + 334c252 commit 755bf65

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ RUN \
44
DEBIAN_FRONTEND=noninteractive \
55
apt-get install -y \
66
build-essential autoconf automake libpcre3-dev libevent-dev \
7-
pkg-config zlib1g-dev git libboost-all-dev cmake flex
7+
pkg-config zlib1g-dev libssl-dev git libboost-all-dev cmake flex
88
RUN git clone https://github.com/RedisLabs/memtier_benchmark.git
99
WORKDIR /memtier_benchmark
1010
RUN autoreconf -ivf && ./configure && make && make install

memtier_benchmark.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,9 @@ int main(int argc, char *argv[])
11681168
if (cfg.tls) {
11691169
init_openssl();
11701170

1171-
cfg.openssl_ctx = SSL_CTX_new(TLS_client_method());
1171+
cfg.openssl_ctx = SSL_CTX_new(SSLv23_client_method());
1172+
SSL_CTX_set_options(cfg.openssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
1173+
11721174
if (cfg.tls_cert) {
11731175
if (!SSL_CTX_use_certificate_file(cfg.openssl_ctx, cfg.tls_cert,
11741176
SSL_FILETYPE_PEM)) {

0 commit comments

Comments
 (0)