diff --git a/ext/puma_http11/org/jruby/puma/MiniSSL.java b/ext/puma_http11/org/jruby/puma/MiniSSL.java index e89b9700..119de110 100644 --- a/ext/puma_http11/org/jruby/puma/MiniSSL.java +++ b/ext/puma_http11/org/jruby/puma/MiniSSL.java @@ -153,13 +153,7 @@ public class MiniSSL extends RubyObject { sslCtx.init(kmf.getKeyManagers(), null, null); engine = sslCtx.createSSLEngine(); - IRubyObject enableSSLv3 = miniSSLContext.callMethod(threadContext, "enable_SSLv3"); - String[] protocols; - if (enableSSLv3 instanceof RubyBoolean && enableSSLv3.isTrue()) { - protocols = new String[] { "SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2" }; - } else { - protocols = new String[] { "TLSv1", "TLSv1.1", "TLSv1.2" }; - } + String[] protocols = new String[] { "TLSv1", "TLSv1.1", "TLSv1.2" }; engine.setEnabledProtocols(protocols); engine.setUseClientMode(false); diff --git a/lib/puma/minissl.rb b/lib/puma/minissl.rb index 94f0569e..0ae9ab75 100644 --- a/lib/puma/minissl.rb +++ b/lib/puma/minissl.rb @@ -95,11 +95,6 @@ module Puma # jruby-specific Context properties: java uses a keystore and password pair rather than a cert/key pair attr_reader :keystore attr_accessor :keystore_pass - attr_accessor :enable_SSLv3 - - def initialize - @enable_SSLv3 = false - end def keystore=(keystore) raise ArgumentError, "No such keystore file '#{keystore}'" unless File.exist? keystore diff --git a/test/test_puma_server_ssl.rb b/test/test_puma_server_ssl.rb index c81d63df..19c35698 100644 --- a/test/test_puma_server_ssl.rb +++ b/test/test_puma_server_ssl.rb @@ -97,41 +97,4 @@ class TestPumaServerSSL < Test::Unit::TestCase end end - if defined?(JRUBY_VERSION) - def test_enabling_ssl_v3_support - @server.stop(true) - @ctx.enable_SSLv3 = true - @server = Puma::Server.new @app, @events - @server.add_ssl_listener @host, @port, @ctx - @server.run - @http.ssl_version='SSLv3' - - body = nil - @http.start do - req = Net::HTTP::Get.new "/", {} - - @http.request(req) do |rep| - body = rep.body - end - end - - assert_equal "https", body - end - - def test_enabling_ssl_v3_support_requires_true - @server.stop(true) - @ctx.enable_SSLv3 = "truthy but not true" - @server = Puma::Server.new @app, @events - @server.add_ssl_listener @host, @port, @ctx - @server.run - @http.ssl_version='SSLv3' - - assert_raises(OpenSSL::SSL::SSLError) do - @http.start do - Net::HTTP::Get.new '/' - end - end - end - end - end \ No newline at end of file