Skip to content

💥 Do not mixin OpenSSL and OpenSSL::SSL modules #533

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 16, 2025
Merged

💥 Do not mixin OpenSSL and OpenSSL::SSL modules #533

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
981908a
♻️ Use full namespace for `OpenSSL::SSL` constants
nevans May 1, 2025
3bba1c0
💥 Do not mixin `OpenSSL::SSL` module
nevans May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions lib/net/imap.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,10 +805,6 @@ class IMAP < Protocol
autoload :StringPrep, "#{dir}/stringprep"

include MonitorMixin
if defined?(OpenSSL::SSL)
include OpenSSL
include SSL
end

# :call-seq:
# Net::IMAP::SequenceSet(set = nil) -> SequenceSet
Expand Down Expand Up @@ -3782,7 +3778,7 @@ def coerce_search_array_arg_to_seqset?(obj)
def build_ssl_ctx(ssl)
if ssl
params = (Hash.try_convert(ssl) || {}).freeze
context = SSLContext.new
context = OpenSSL::SSL::SSLContext.new
context.set_params(params)
if defined?(VerifyCallbackProc)
context.verify_callback = VerifyCallbackProc
Expand All @@ -3798,12 +3794,12 @@ def start_tls_session
raise "SSL extension not installed" unless defined?(OpenSSL::SSL)
raise "already using SSL" if @sock.kind_of?(OpenSSL::SSL::SSLSocket)
raise "cannot start TLS without SSLContext" unless ssl_ctx
@sock = SSLSocket.new(@sock, ssl_ctx)
@sock = OpenSSL::SSL::SSLSocket.new(@sock, ssl_ctx)
@reader = ResponseReader.new(self, @sock)
@sock.sync_close = true
@sock.hostname = @host if @sock.respond_to? :hostname=
ssl_socket_connect(@sock, open_timeout)
if ssl_ctx.verify_mode != VERIFY_NONE
if ssl_ctx.verify_mode != OpenSSL::SSL::VERIFY_NONE
@sock.post_connection_check(@host)
@tls_verified = true
end
Expand Down