diff options
| -rw-r--r-- | lib/net/smtp.rb | 2 | ||||
| -rw-r--r-- | test/net/smtp/test_ssl_socket.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index f8121cd44f..52c5d813eb 100644 --- a/lib/net/smtp.rb +++ b/lib/net/smtp.rb @@ -583,7 +583,7 @@ module Net logging "TLS connection started" s.sync_close = true ssl_socket_connect(s, @open_timeout) - if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE + if @ssl_context.verify_mode && @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE s.post_connection_check(@address) end verified = true diff --git a/test/net/smtp/test_ssl_socket.rb b/test/net/smtp/test_ssl_socket.rb index 342391f159..dd9529f25e 100644 --- a/test/net/smtp/test_ssl_socket.rb +++ b/test/net/smtp/test_ssl_socket.rb @@ -53,8 +53,10 @@ module Net end } + ssl_context = OpenSSL::SSL::SSLContext.new + ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER connection = MySMTP.new('localhost', 25) - connection.enable_starttls_auto + connection.enable_starttls_auto(ssl_context) connection.fake_tcp = tcp_socket connection.fake_ssl = ssl_socket |