kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

revert r48819

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-13 03:05:31 +00:00
parent 76b9d37b56
commit 88cea9f7e2
2 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
test/openssl/test_ocsp.rb
View file

@ -3,7 +3,23 @@ require_relative "utils"
if defined?(OpenSSL) if defined?(OpenSSL)
class OpenSSL::TestOCSP < Test::Unit::TestCase class OpenSSL::TestOCSP < Test::Unit::TestCase
include OpenSSL::OCSPTestSetup def setup
ca_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
ca_key = OpenSSL::TestUtils::TEST_KEY_RSA1024
ca_serial = 0xabcabcabcabc
subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCert")
@key = OpenSSL::TestUtils::TEST_KEY_RSA1024
serial = 0xabcabcabcabd
now = Time.at(Time.now.to_i) # suppress usec
dgst = OpenSSL::Digest::SHA1.new
@ca_cert = OpenSSL::TestUtils.issue_cert(
ca_subj, ca_key, ca_serial, now, now+3600, [], nil, nil, dgst)
@cert = OpenSSL::TestUtils.issue_cert(
subj, @key, serial, now, now+3600, [], @ca_cert, nil, dgst)
end
def test_new_certificate_id def test_new_certificate_id
cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert) cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert)
@ -18,9 +34,6 @@ class OpenSSL::TestOCSP < Test::Unit::TestCase
end if defined?(OpenSSL::Digest::SHA256) end if defined?(OpenSSL::Digest::SHA256)
def test_new_ocsp_request def test_new_ocsp_request
assert_separately(%w[-ropenssl/utils -], <<-END)
extend OpenSSL::OCSPTestSetup
setup
request = OpenSSL::OCSP::Request.new request = OpenSSL::OCSP::Request.new
cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert, OpenSSL::Digest::SHA1.new) cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert, OpenSSL::Digest::SHA1.new)
request.add_certid(cid) request.add_certid(cid)
@ -28,7 +41,6 @@ class OpenSSL::TestOCSP < Test::Unit::TestCase
assert_kind_of OpenSSL::OCSP::Request, request assert_kind_of OpenSSL::OCSP::Request, request
# in current implementation not same instance of certificate id, but should contain same data # in current implementation not same instance of certificate id, but should contain same data
assert_equal cid.serial, request.certid.first.serial assert_equal cid.serial, request.certid.first.serial
END
end end
end end

20
test/openssl/utils.rb
View file

@ -327,24 +327,4 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
end end
end end
module OpenSSL::OCSPTestSetup
def setup
ca_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
ca_key = OpenSSL::TestUtils::TEST_KEY_RSA1024
ca_serial = 0xabcabcabcabc
subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCert")
@key = OpenSSL::TestUtils::TEST_KEY_RSA1024
serial = 0xabcabcabcabd
now = Time.at(Time.now.to_i) # suppress usec
dgst = OpenSSL::Digest::SHA1.new
@ca_cert = OpenSSL::TestUtils.issue_cert(
ca_subj, ca_key, ca_serial, now, now+3600, [], nil, nil, dgst)
@cert = OpenSSL::TestUtils.issue_cert(
subj, @key, serial, now, now+3600, [], @ca_cert, nil, dgst)
end
end
end if defined?(OpenSSL) end if defined?(OpenSSL)