mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
88cea9f7e2
commit
af06381332
28 changed files with 29 additions and 28 deletions
|
@ -605,5 +605,5 @@ rEzBQ0F9dUyqQ9gyRg8KHhDfv9HzT1d/rnUZMkoombwYBRIUChGCYV0GnJcan2Zm
|
|||
assert_equal(:UNIVERSAL, asn1.tag_class)
|
||||
end
|
||||
|
||||
end if defined?(OpenSSL)
|
||||
end if defined?(OpenSSL::TestUtils)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative 'utils'
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestBN < Test::Unit::TestCase
|
||||
def test_new_str
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative 'utils'
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestCipher < Test::Unit::TestCase
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative 'utils'
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestDigest < Test::Unit::TestCase
|
||||
def setup
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative 'utils'
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestFIPS < Test::Unit::TestCase
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative 'utils'
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestNSSPI < Test::Unit::TestCase
|
||||
def setup
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative "utils"
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestOCSP < Test::Unit::TestCase
|
||||
def setup
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative 'utils'
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
require 'socket'
|
||||
require_relative '../ruby/ut_eof'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative "utils"
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
module OpenSSL
|
||||
class TestPKCS12 < Test::Unit::TestCase
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative 'utils'
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestPKCS7 < Test::Unit::TestCase
|
||||
def setup
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative 'utils'
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestPKeyDH < Test::Unit::TestCase
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative "utils"
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestSSL < OpenSSL::SSLTestCase
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative "utils"
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestSSLSession < OpenSSL::SSLTestCase
|
||||
def test_session_equals
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative "utils"
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestX509Certificate < Test::Unit::TestCase
|
||||
def setup
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative "utils"
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestX509CRL < Test::Unit::TestCase
|
||||
def setup
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative 'utils'
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestX509Extension < Test::Unit::TestCase
|
||||
def setup
|
||||
|
|
|
@ -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(
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative "utils"
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestX509Request < Test::Unit::TestCase
|
||||
def setup
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require_relative "utils"
|
||||
|
||||
if defined?(OpenSSL)
|
||||
if defined?(OpenSSL::TestUtils)
|
||||
|
||||
class OpenSSL::TestX509Store < Test::Unit::TestCase
|
||||
def setup
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue