-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
tls: Introduce OpenSSL #2569
Open
michael-redpanda
wants to merge
5
commits into
scylladb:master
Choose a base branch
from
michael-redpanda:add-openssl-implementation
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+3,685
−896
Open
tls: Introduce OpenSSL #2569
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
2b7397f
tls: Create tls-impl
michael-redpanda a108542
tls: Added OpenSSL implementation
michael-redpanda 0a974b2
tls: Added tls_logger and log statements
michael-redpanda 98a2d0f
test/tls: Using CA extension for generating CA
michael-redpanda 2f935ca
tls/test: Updated test_reload_certificates
michael-redpanda File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -89,6 +89,16 @@ if (NOT Seastar_SCHEDULING_GROUPS_COUNT MATCHES "^[1-9][0-9]*") | |
message(FATAL_ERROR "Seastar_SCHEDULING_GROUPS_COUNT must be a positive number (${Seastar_SCHEDULING_GROUPS_COUNT})") | ||
endif () | ||
|
||
option (Seastar_USE_OPENSSL | ||
"Use OpenSSL rather than GnuTLS for cryptographic operations, including TLS" | ||
OFF) | ||
|
||
if (Seastar_USE_OPENSSL) | ||
set(Seastar_USE_GNUTLS OFF) | ||
else() | ||
set(Seastar_USE_GNUTLS ON) | ||
Comment on lines
+97
to
+99
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. could you please add space after |
||
endif () | ||
|
||
# | ||
# Add a dev build type. | ||
# | ||
|
@@ -753,13 +763,16 @@ add_library (seastar | |
src/net/native-stack-impl.hh | ||
src/net/native-stack.cc | ||
src/net/net.cc | ||
$<$<BOOL:${Seastar_USE_OPENSSL}>:src/net/ossl.cc> | ||
src/net/packet.cc | ||
src/net/posix-stack.cc | ||
src/net/proxy.cc | ||
src/net/socket_address.cc | ||
src/net/stack.cc | ||
src/net/tcp.cc | ||
src/net/tls.cc | ||
$<$<BOOL:${Seastar_USE_GNUTLS}>:src/net/tls.cc> | ||
src/net/tls-impl.cc | ||
src/net/tls-impl.hh | ||
src/net/udp.cc | ||
src/net/unix_address.cc | ||
src/net/virtio.cc | ||
|
@@ -778,6 +791,9 @@ add_library (seastar | |
src/util/tmp_file.cc | ||
src/util/short_streams.cc | ||
src/websocket/server.cc | ||
src/websocket/base64.hh | ||
$<$<BOOL:${Seastar_USE_GNUTLS}>:src/websocket/base64-gnutls.cc> | ||
$<$<BOOL:${Seastar_USE_OPENSSL}>:src/websocket/base64-openssl.cc> | ||
) | ||
|
||
add_library (Seastar::seastar ALIAS seastar) | ||
|
@@ -856,7 +872,9 @@ target_link_libraries (seastar | |
SourceLocation::source_location | ||
PRIVATE | ||
${CMAKE_DL_LIBS} | ||
GnuTLS::gnutls | ||
$<$<BOOL:${Seastar_USE_GNUTLS}>:GnuTLS::gnutls> | ||
$<$<BOOL:${Seastar_USE_OPENSSL}>:OpenSSL::SSL> | ||
$<$<BOOL:${Seastar_USE_OPENSSL}>:OpenSSL::Crypto> | ||
StdAtomic::atomic | ||
lksctp-tools::lksctp-tools | ||
protobuf::libprotobuf | ||
|
@@ -913,6 +931,8 @@ include (CTest) | |
target_compile_definitions(seastar | ||
PUBLIC | ||
SEASTAR_API_LEVEL=${Seastar_API_LEVEL} | ||
$<$<BOOL:${Seastar_USE_OPENSSL}>:SEASTAR_USE_OPENSSL> | ||
$<$<BOOL:${Seastar_USE_GNUTLS}>:SEASTAR_USE_GNUTLS> | ||
$<$<BOOL:${BUILD_SHARED_LIBS}>:SEASTAR_BUILD_SHARED_LIBS>) | ||
|
||
target_compile_features(seastar | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
piggyback the tests with OpenSSL / GnuTLS might not be a great idea. because, we only enable the test step in
seastar/.github/workflows/test.yaml
Lines 110 to 112 in 613d8b3
tests.yaml
for building with the OpenSSL backend, and keep the existing job ofbuild_with_cxx_modules
intact.please allow me to provide more context here: because C++20 modules is currently an experimental feature, not all Seastar facilities are exposed as in the "seastar" C++20 module at this moment, and we only have a single "hello_cxx_module" test for testing the build with C++20 module. none of the unit tests is built with the "seastar" C++20 module at the time of writing.