Skip to content

Commit c995029

Browse files
trondnceejatec
authored andcommitted
MB-59071: Upgrade to OpenSSL 3.x
As part of upgrade to OpenSSL 3 remove the MD5 hash as it is deprecated in OpenSSL3 (and not used in our product anymore after we dropped support for CRAM-MD5) Include the fix for MB-58222 causing cbstats to fail due to use of `inspect.getargspec` (Upgrade of OpenSSL brought in a new version of Python) Change-Id: I044cf40864ef391027e630a72ccfa3d1a9f4e15c Reviewed-on: https://review.couchbase.org/c/kv_engine/+/199148 Reviewed-by: Dave Rigby <[email protected]> Tested-by: Trond Norbye <[email protected]> Well-Formed: Restriction Checker
1 parent 1f1f244 commit c995029

File tree

19 files changed

+24
-813
lines changed

19 files changed

+24
-813
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ include_directories(AFTER SYSTEM
7373
${phosphor_SOURCE_DIR}/include
7474
${gsl_lite_SOURCE_DIR}/include
7575
${LIBEVENT_INCLUDE_DIR}
76-
${OPENSSL_INCLUDE_DIR}
7776
${BOOST_INCLUDE_DIR})
7877

7978
if (WIN32)

cbcrypto/CMakeLists.txt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,7 @@ add_library(cbcrypto STATIC
22
cbcrypto.cc
33
${PROJECT_SOURCE_DIR}/include/cbcrypto/cbcrypto.h)
44
kv_enable_pch(cbcrypto)
5-
6-
if (APPLE)
7-
# Apple is using the Common Crypto Framework for all crypto functions
8-
target_link_libraries(cbcrypto PRIVATE platform phosphor)
9-
elseif (WIN32)
10-
# Use the OpenSSL ones for all other platforms
11-
target_link_libraries(cbcrypto PRIVATE platform phosphor Bcrypt)
12-
else()
13-
# Use the OpenSSL ones for all other platforms
14-
target_link_libraries(cbcrypto PRIVATE platform phosphor ${OPENSSL_LIBRARIES})
15-
endif ()
5+
target_link_libraries(cbcrypto PRIVATE platform phosphor OpenSSL::SSL)
166

177
cb_add_test_executable(cbcrypto_test
188
cbcrypto_test.cc

0 commit comments

Comments
 (0)