diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a58a443..4a1ceede 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,3 +111,17 @@ jobs: run: brew install autoconf automake libtool libevent pkg-config openssl@1.1 - name: Build run: autoreconf -ivf && PKG_CONFIG_PATH=/usr/local/opt/openssl@1.1/lib/pkgconfig ./configure && make + + build-macos-openssl-1.0: + strategy: + matrix: + platform: [macos-latest] + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@v1 + - name: Install dependencies + run: brew install autoconf automake libtool libevent pkg-config + - name: Install openssl v1.0.2 + run: brew install rbenv/tap/openssl@1.0 + - name: Build + run: autoreconf -ivf && PKG_CONFIG_PATH=/usr/local/opt/openssl@1.0/lib/pkgconfig ./configure && make diff --git a/memtier_benchmark.cpp b/memtier_benchmark.cpp index 61f560a2..2314da88 100755 --- a/memtier_benchmark.cpp +++ b/memtier_benchmark.cpp @@ -1392,8 +1392,11 @@ int main(int argc, char *argv[]) SSL_CTX_set_options(cfg.openssl_ctx, SSL_OP_NO_TLSv1_1); if (!(cfg.tls_protocols & REDIS_TLS_PROTO_TLSv1_2)) SSL_CTX_set_options(cfg.openssl_ctx, SSL_OP_NO_TLSv1_2); +// TLS 1.3 is only available as from version 1.1.1. +#if OPENSSL_VERSION_NUMBER >= 0x10101000L if (!(cfg.tls_protocols & REDIS_TLS_PROTO_TLSv1_3)) SSL_CTX_set_options(cfg.openssl_ctx, SSL_OP_NO_TLSv1_3); +#endif if (cfg.tls_cert) { if (!SSL_CTX_use_certificate_chain_file(cfg.openssl_ctx, cfg.tls_cert)) {