1 files changed, 6 insertions, 28 deletions
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 97b2c22472..97a3a46169 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -505,39 +505,17 @@ if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1_2
 
 end
 
-  def test_disable_client_renegotiation
-    ctx_proc = Proc.new { |ctx| ctx.disable_client_renegotiation }
+  def test_renegotiation_cb
+    num_handshakes = 0
+    renegotiation_cb = Proc.new { |ssl| num_handshakes += 1 }
+    ctx_proc = Proc.new { |ctx| ctx.renegotiation_cb = renegotiation_cb }
     start_server_version(:SSLv23, ctx_proc) { |server, port|
       server_connect(port) { |ssl|
-        assert(ssl.ssl_version)
+        assert_equal(1, num_handshakes)
       }
     }
   end
-
-  def test_allow_client_renegotiation_args
-    ctx = OpenSSL::SSL::SSLContext.new
-    assert_raise(ArgumentError) { ctx.allow_client_renegotiation(0) }
-    assert_raise(ArgumentError) { ctx.allow_client_renegotiation(-1) }
-  end
-
-  def test_allow_client_renegotiation_once
-    ctx_proc = Proc.new { |ctx| ctx.allow_client_renegotiation(2) }
-    start_server_version(:SSLv23, ctx_proc) { |server, port|
-      server_connect(port) { |ssl|
-        assert(ssl.ssl_version)
-      }
-    }
-  end
-
-  def test_allow_arbitrary_client_renegotiation
-    ctx_proc = Proc.new { |ctx| ctx.allow_client_renegotiation }
-    start_server_version(:SSLv23, ctx_proc) { |server, port|
-      server_connect(port) { |ssl|
-        assert(ssl.ssl_version)
-      }
-    }
-  end
-
+  
   private
 
   def start_server_version(version, ctx_proc=nil, server_proc=nil, &blk)