From 773d2362ff3e02e2250dbddb4690277f872e3903 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Tue, 17 Jan 2017 15:36:48 +0900 Subject: Backport "Merge branch 'topic/test-memory-leak'" to maint * topic/test-memory-leak: Enable OSSL_MDEBUG on CI builds Add OpenSSL.print_mem_leaks test: prepare test PKey instances on demand test: let OpenSSL::TestCase include OpenSSL::TestUtils Don't define main() when built with --enable-debug (cherry picked from commit 5c586acc387834ab4e09260937dc21064fc59de4) Note that fix for new test cases that use the old constants removed by this is squashed in. --- test/test_pair.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/test_pair.rb') diff --git a/test/test_pair.rb b/test/test_pair.rb index 9a5205f8..81a55cbe 100644 --- a/test/test_pair.rb +++ b/test/test_pair.rb @@ -13,7 +13,7 @@ module OpenSSL::SSLPairM ctx = OpenSSL::SSL::SSLContext.new() ctx.ciphers = "ADH" ctx.security_level = 0 - ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 } + ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey_dh("dh1024") } tcps = create_tcp_server(host, port) ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx) return ssls @@ -356,7 +356,7 @@ module OpenSSL::TestPairM ctx2 = OpenSSL::SSL::SSLContext.new ctx2.ciphers = "ADH" ctx2.security_level = 0 - ctx2.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 } + ctx2.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey_dh("dh1024") } sock1, sock2 = tcp_pair @@ -406,7 +406,7 @@ module OpenSSL::TestPairM ctx = OpenSSL::SSL::SSLContext.new() ctx.ciphers = "ADH" ctx.security_level = 0 - ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 } + ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::Fixtures.pkey_dh("dh1024") } sock1, sock2 = tcp_pair -- cgit v1.2.3