diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2017-01-17 15:36:48 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2017-08-24 12:47:41 +0900 |
| commit | 773d2362ff3e02e2250dbddb4690277f872e3903 (patch) | |
| tree | 16a2c5b9979a8930734d868de35e24dabf37ecdf /test/test_x509store.rb | |
| parent | 6a79a06a78ad74441a58da166e108b656aa89f61 (diff) | |
| download | ruby-openssl-773d2362ff3e02e2250dbddb4690277f872e3903.tar.gz | |
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.
Diffstat (limited to 'test/test_x509store.rb')
| -rw-r--r-- | test/test_x509store.rb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/test/test_x509store.rb b/test/test_x509store.rb index c45233aa..983437e7 100644 --- a/test/test_x509store.rb +++ b/test/test_x509store.rb @@ -6,10 +6,10 @@ if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Store < OpenSSL::TestCase def setup super - @rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024 - @rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048 - @dsa256 = OpenSSL::TestUtils::TEST_KEY_DSA256 - @dsa512 = OpenSSL::TestUtils::TEST_KEY_DSA512 + @rsa1024 = Fixtures.pkey("rsa1024") + @rsa2048 = Fixtures.pkey("rsa2048") + @dsa256 = Fixtures.pkey("dsa256") + @dsa512 = Fixtures.pkey("dsa512") @ca1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA1") @ca2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA2") @ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1") @@ -26,14 +26,6 @@ class OpenSSL::TestX509Store < OpenSSL::TestCase ctx.verify end - def issue_cert(*args) - OpenSSL::TestUtils.issue_cert(*args) - end - - def issue_crl(*args) - OpenSSL::TestUtils.issue_crl(*args) - end - def test_add_file ca_exts = [ ["basicConstraints", "CA:TRUE", true], |