diff options
author | nobu <nobu@ruby-lang.org> | 2014-12-13 03:05:43 +0000 |
---|---|---|
committer | nobu <nobu@ruby-lang.org> | 2014-12-13 03:05:43 +0000 |
commit | 7ddf7e0b6878785c54074588f88b15d61e2bc051 (patch) | |
tree | c9f26e52e4feafc116b351f784e73d903c436c00 | |
parent | b81b06da26417ccc84dbff673b0da89f97bddbe3 (diff) | |
download | ruby-openssl-history-7ddf7e0b6878785c54074588f88b15d61e2bc051.tar.gz |
test/openssl: skip old OpenSSL
* test/openssl/utils.rb (OpenSSL::TestUtils): ignore out-of-date
OpenSSL before 1.0.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/test_asn1.rb | 2 | ||||
-rw-r--r-- | test/test_bn.rb | 2 | ||||
-rw-r--r-- | test/test_buffering.rb | 2 | ||||
-rw-r--r-- | test/test_cipher.rb | 2 | ||||
-rw-r--r-- | test/test_config.rb | 2 | ||||
-rw-r--r-- | test/test_digest.rb | 2 | ||||
-rw-r--r-- | test/test_engine.rb | 2 | ||||
-rw-r--r-- | test/test_fips.rb | 2 | ||||
-rw-r--r-- | test/test_hmac.rb | 2 | ||||
-rw-r--r-- | test/test_ns_spki.rb | 2 | ||||
-rw-r--r-- | test/test_ocsp.rb | 2 | ||||
-rw-r--r-- | test/test_pair.rb | 2 | ||||
-rw-r--r-- | test/test_partial_record_read.rb | 2 | ||||
-rw-r--r-- | test/test_pkcs12.rb | 2 | ||||
-rw-r--r-- | test/test_pkcs5.rb | 2 | ||||
-rw-r--r-- | test/test_pkcs7.rb | 2 | ||||
-rw-r--r-- | test/test_pkey_dh.rb | 2 | ||||
-rw-r--r-- | test/test_pkey_dsa.rb | 2 | ||||
-rw-r--r-- | test/test_pkey_rsa.rb | 2 | ||||
-rw-r--r-- | test/test_ssl.rb | 2 | ||||
-rw-r--r-- | test/test_ssl_session.rb | 2 | ||||
-rw-r--r-- | test/test_x509cert.rb | 2 | ||||
-rw-r--r-- | test/test_x509crl.rb | 2 | ||||
-rw-r--r-- | test/test_x509ext.rb | 2 | ||||
-rw-r--r-- | test/test_x509name.rb | 2 | ||||
-rw-r--r-- | test/test_x509req.rb | 2 | ||||
-rw-r--r-- | test/test_x509store.rb | 2 | ||||
-rw-r--r-- | test/utils.rb | 3 |
28 files changed, 29 insertions, 28 deletions
diff --git a/test/test_asn1.rb b/test/test_asn1.rb index 3ea2638..9fb5a55 100644 --- a/test/test_asn1.rb +++ b/test/test_asn1.rb @@ -605,5 +605,5 @@ rEzBQ0F9dUyqQ9gyRg8KHhDfv9HzT1d/rnUZMkoombwYBRIUChGCYV0GnJcan2Zm assert_equal(:UNIVERSAL, asn1.tag_class) end -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) diff --git a/test/test_bn.rb b/test/test_bn.rb index 27bbcdf..667cb29 100644 --- a/test/test_bn.rb +++ b/test/test_bn.rb @@ -1,6 +1,6 @@ require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestBN < Test::Unit::TestCase def test_new_str diff --git a/test/test_buffering.rb b/test/test_buffering.rb index c4894e1..c62dd4d 100644 --- a/test/test_buffering.rb +++ b/test/test_buffering.rb @@ -84,4 +84,4 @@ class OpenSSL::TestBuffering < Test::Unit::TestCase assert_equal([97, 98, 99], res) end -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) diff --git a/test/test_cipher.rb b/test/test_cipher.rb index 156fa2a..30220d1 100644 --- a/test/test_cipher.rb +++ b/test/test_cipher.rb @@ -1,6 +1,6 @@ require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestCipher < Test::Unit::TestCase diff --git a/test/test_config.rb b/test/test_config.rb index 4ad90c4..62f9fab 100644 --- a/test/test_config.rb +++ b/test/test_config.rb @@ -294,4 +294,4 @@ __EOC__ @it['newsection'] = {'a' => 'b'} assert_not_equal(@it.sections.sort, c.sections.sort) end -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) diff --git a/test/test_digest.rb b/test/test_digest.rb index c2a3f70..a23b2ef 100644 --- a/test/test_digest.rb +++ b/test/test_digest.rb @@ -1,6 +1,6 @@ require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestDigest < Test::Unit::TestCase def setup diff --git a/test/test_engine.rb b/test/test_engine.rb index 46a2948..a7264d0 100644 --- a/test/test_engine.rb +++ b/test/test_engine.rb @@ -71,5 +71,5 @@ class OpenSSL::TestEngine < Test::Unit::TestCase cipher.update(data) + cipher.final end -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) diff --git a/test/test_fips.rb b/test/test_fips.rb index 882647f..6e4ac6d 100644 --- a/test/test_fips.rb +++ b/test/test_fips.rb @@ -1,6 +1,6 @@ require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestFIPS < Test::Unit::TestCase diff --git a/test/test_hmac.rb b/test/test_hmac.rb index f1e4536..f709ebd 100644 --- a/test/test_hmac.rb +++ b/test/test_hmac.rb @@ -38,4 +38,4 @@ class OpenSSL::TestHMAC < Test::Unit::TestCase result = hmac.update(data).hexdigest assert_equal "a13984b929a07912e4e21c5720876a8e150d6f67f854437206e7f86547248396", result end -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) diff --git a/test/test_ns_spki.rb b/test/test_ns_spki.rb index 7cddefa..ab07bfb 100644 --- a/test/test_ns_spki.rb +++ b/test/test_ns_spki.rb @@ -1,6 +1,6 @@ require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestNSSPI < Test::Unit::TestCase def setup diff --git a/test/test_ocsp.rb b/test/test_ocsp.rb index b42b57d..af727d8 100644 --- a/test/test_ocsp.rb +++ b/test/test_ocsp.rb @@ -1,6 +1,6 @@ require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestOCSP < Test::Unit::TestCase def setup diff --git a/test/test_pair.rb b/test/test_pair.rb index b9206da..3aca5f4 100644 --- a/test/test_pair.rb +++ b/test/test_pair.rb @@ -1,6 +1,6 @@ require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) require 'socket' require_relative '../ruby/ut_eof' diff --git a/test/test_partial_record_read.rb b/test/test_partial_record_read.rb index 2d23fc4..1899a30 100644 --- a/test/test_partial_record_read.rb +++ b/test/test_partial_record_read.rb @@ -1,6 +1,6 @@ require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestPartialRecordRead < OpenSSL::SSLTestCase def test_partial_tls_record_read_nonblock diff --git a/test/test_pkcs12.rb b/test/test_pkcs12.rb index 25ff606..4e37904 100644 --- a/test/test_pkcs12.rb +++ b/test/test_pkcs12.rb @@ -1,6 +1,6 @@ require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) module OpenSSL class TestPKCS12 < Test::Unit::TestCase diff --git a/test/test_pkcs5.rb b/test/test_pkcs5.rb index 30fa3e5..5e85dde 100644 --- a/test/test_pkcs5.rb +++ b/test/test_pkcs5.rb @@ -94,4 +94,4 @@ class OpenSSL::TestPKCS5 < Test::Unit::TestCase assert_equal(value1, value2) end if OpenSSL::PKCS5.respond_to?(:pbkdf2_hmac) -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) diff --git a/test/test_pkcs7.rb b/test/test_pkcs7.rb index a1ff048..47bd4f3 100644 --- a/test/test_pkcs7.rb +++ b/test/test_pkcs7.rb @@ -1,6 +1,6 @@ require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestPKCS7 < Test::Unit::TestCase def setup diff --git a/test/test_pkey_dh.rb b/test/test_pkey_dh.rb index 160a131..67dd3e7 100644 --- a/test/test_pkey_dh.rb +++ b/test/test_pkey_dh.rb @@ -1,6 +1,6 @@ require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestPKeyDH < Test::Unit::TestCase diff --git a/test/test_pkey_dsa.rb b/test/test_pkey_dsa.rb index 555637e..e4ea1b5 100644 --- a/test/test_pkey_dsa.rb +++ b/test/test_pkey_dsa.rb @@ -1,7 +1,7 @@ require_relative 'utils' require 'base64' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestPKeyDSA < Test::Unit::TestCase def test_private diff --git a/test/test_pkey_rsa.rb b/test/test_pkey_rsa.rb index df0c609..ea042c2 100644 --- a/test/test_pkey_rsa.rb +++ b/test/test_pkey_rsa.rb @@ -1,7 +1,7 @@ require_relative 'utils' require 'base64' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestPKeyRSA < Test::Unit::TestCase def test_padding diff --git a/test/test_ssl.rb b/test/test_ssl.rb index 139b93d..3eddb0a 100644 --- a/test/test_ssl.rb +++ b/test/test_ssl.rb @@ -1,6 +1,6 @@ require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestSSL < OpenSSL::SSLTestCase diff --git a/test/test_ssl_session.rb b/test/test_ssl_session.rb index 8066ef1..d4c2220 100644 --- a/test/test_ssl_session.rb +++ b/test/test_ssl_session.rb @@ -1,6 +1,6 @@ require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestSSLSession < OpenSSL::SSLTestCase def test_session_equals diff --git a/test/test_x509cert.rb b/test/test_x509cert.rb index f13d645..783677a 100644 --- a/test/test_x509cert.rb +++ b/test/test_x509cert.rb @@ -1,6 +1,6 @@ require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Certificate < Test::Unit::TestCase def setup diff --git a/test/test_x509crl.rb b/test/test_x509crl.rb index d502475..9dc1b1c 100644 --- a/test/test_x509crl.rb +++ b/test/test_x509crl.rb @@ -1,6 +1,6 @@ require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509CRL < Test::Unit::TestCase def setup diff --git a/test/test_x509ext.rb b/test/test_x509ext.rb index 89b45c7..29e9f1d 100644 --- a/test/test_x509ext.rb +++ b/test/test_x509ext.rb @@ -1,6 +1,6 @@ require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Extension < Test::Unit::TestCase def setup diff --git a/test/test_x509name.rb b/test/test_x509name.rb index de35fc3..a92af53 100644 --- a/test/test_x509name.rb +++ b/test/test_x509name.rb @@ -1,7 +1,7 @@ # coding: US-ASCII require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Name < Test::Unit::TestCase OpenSSL::ASN1::ObjectId.register( diff --git a/test/test_x509req.rb b/test/test_x509req.rb index d0b6a57..27040cb 100644 --- a/test/test_x509req.rb +++ b/test/test_x509req.rb @@ -1,6 +1,6 @@ require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Request < Test::Unit::TestCase def setup diff --git a/test/test_x509store.rb b/test/test_x509store.rb index 439c9de..f3e144f 100644 --- a/test/test_x509store.rb +++ b/test/test_x509store.rb @@ -1,6 +1,6 @@ require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Store < Test::Unit::TestCase def setup diff --git a/test/utils.rb b/test/utils.rb index 84cd48d..1da3bcf 100644 --- a/test/utils.rb +++ b/test/utils.rb @@ -327,4 +327,5 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC end end -end if defined?(OpenSSL) +end if defined?(OpenSSL::OPENSSL_LIBRARY_VERSION) and + /\AOpenSSL +0\./ !~ OpenSSL::OPENSSL_LIBRARY_VERSION |