Skip to content

Commit

Permalink
assume openssl 1.1.0 when checking for ocb support
Browse files Browse the repository at this point in the history
Summary: We already assume 1.1.0. This changes the code not to test for 1.1.0 anymore as part of testing for ocb support.

Reviewed By: abakiaydin, dmm-fb

Differential Revision: D54775579

fbshipit-source-id: bbe5ad9fd7a367f90c7a091d8099011e7a84a17c
  • Loading branch information
yfeldblum authored and facebook-github-bot committed Mar 18, 2024
1 parent 76af6d2 commit 63f3bdc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mcrouter/lib/network/FizzContextProvider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ FizzContextAndVerifier createClientFizzContextAndVerifier(
}

if (preferOcbCipher) {
#if FOLLY_OPENSSL_IS_110 && !defined(OPENSSL_NO_OCB)
#if !defined(OPENSSL_NO_OCB)
auto ciphers = folly::copy(ctx->getSupportedCiphers());
ciphers.insert(
ciphers.begin(),
Expand Down Expand Up @@ -116,7 +116,7 @@ std::shared_ptr<fizz::server::FizzServerContext> createFizzServerContext(
ctx->setClientAuthMode(fizz::server::ClientAuthMode::Required);
}
if (preferOcbCipher) {
#if FOLLY_OPENSSL_IS_110 && !defined(OPENSSL_NO_OCB)
#if !defined(OPENSSL_NO_OCB)
auto serverCiphers = folly::copy(ctx->getSupportedCiphers());
serverCiphers.insert(
serverCiphers.begin(),
Expand Down

0 comments on commit 63f3bdc

Please sign in to comment.