ssl: allow SSLContext#set_params to be used from non-main Ractors #925
+94
−82
Conversation
This file contains hidden or 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
Explicitly load both the "default" and "legacy" providers in the test case. The "legacy" provider is intended to be used with the "default" provider. The "default" provider is typically loaded automatically, but that only happens when no other provider has been loaded yet.
Check for the function we actually use. Both SSL_set0_tmp_dh_pkey() and SSL_CTX_set0_tmp_dh_pkey() were added in OpenSSL 3.0.
Enable automatic DH parameters for TLS 1.2 or earlier when neither SSLSocket#tmp_dh nor SSLSocket#tmp_dh_callback is set. This is supported since OpenSSL 1.1.0. This allows us to remove the default tmp_dh_callback proc defined in lib/openssl/ssl.rb, which uses hard-coded parameters and is not Ractor-shareable.
tmp_dh_callback no longer has a default value. It also no longer has to share code with tmp_ecdh_callback, which was removed in v3.0.0.
Freeze OpenSSL::SSL::SSLContext::DEFAULT_PARAMS to make it Ractor-shareable. When called from a non-main Ractor, SSLContext#set_params now prepares a new OpenSSL::X509::Store in Ractor-local storage.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Freeze
OpenSSL::SSL::SSLContext::DEFAULT_PARAMSto make it Ractor-shareable.When called from a non-main Ractor,
SSLContext#set_paramsnow prepares a newOpenSSL::X509::Storein Ractor-local storage.This applies on top of #924. Fixes #521.
Note that you need https://bugs.ruby-lang.org/issues/21109 to use
SSLSocketin a non-main Ractor, which will be part of Ruby 3.5.