diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-30 18:21:39 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-30 18:21:39 +0000 |
| commit | 907911fedadd71950413f555342bcb8a18252553 (patch) | |
| tree | e6d1224b20f87d8d7cae95775ecdbabf04fc9522 /test/openssl/test_x509name.rb | |
| parent | 8f77ea14b47ae50245e32e4f895f681a0d8aebdf (diff) | |
* ext/openssl/ossl_ssl.c (ossl_ssl_read): take optional second argument
to specify a string to be written.
* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#read):
take optional second argument to specify a string to be written.
* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#gets):
refine regexp for end-of-line.
* ext/opnessl/lib/openssl/ssl.rb
(OpenSSL::SSL::SocketForwarder#listen): fix typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl/test_x509name.rb')
| -rw-r--r-- | test/openssl/test_x509name.rb | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/test/openssl/test_x509name.rb b/test/openssl/test_x509name.rb index 0fbe2c2569..14004a4e20 100644 --- a/test/openssl/test_x509name.rb +++ b/test/openssl/test_x509name.rb @@ -76,12 +76,21 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase ] name = OpenSSL::X509::Name.new(dn) ary = name.to_a - assert_equal("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou/emailAddress=gotoyuzo@ruby-lang.org/serialNumber=123", name.to_s) + if OpenSSL::OPENSSL_VERSION_NUMBER < 0x00907000 + assert_equal("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou/Email=gotoyuzo@ruby-lang.org/SN=123", name.to_s) + else + assert_equal("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou/emailAddress=gotoyuzo@ruby-lang.org/serialNumber=123", name.to_s) + end assert_equal("DC", ary[0][0]) assert_equal("DC", ary[1][0]) assert_equal("CN", ary[2][0]) - assert_equal("emailAddress", ary[3][0]) - assert_equal("serialNumber", ary[4][0]) + if OpenSSL::OPENSSL_VERSION_NUMBER < 0x00907000 + assert_equal("Email", ary[3][0]) + assert_equal("SN", ary[4][0]) + else + assert_equal("emailAddress", ary[3][0]) + assert_equal("serialNumber", ary[4][0]) + end assert_equal("org", ary[0][1]) assert_equal("ruby-lang", ary[1][1]) assert_equal("GOTOU Yuuzou", ary[2][1]) @@ -140,12 +149,21 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase name = OpenSSL::X509::Name.new dn.each{|attr| name.add_entry(*attr) } ary = name.to_a - assert_equal("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou/emailAddress=gotoyuzo@ruby-lang.org/serialNumber=123", name.to_s) + if OpenSSL::OPENSSL_VERSION_NUMBER < 0x00907000 + assert_equal("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou/Email=gotoyuzo@ruby-lang.org/SN=123", name.to_s) + else + assert_equal("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou/emailAddress=gotoyuzo@ruby-lang.org/serialNumber=123", name.to_s) + end assert_equal("DC", ary[0][0]) assert_equal("DC", ary[1][0]) assert_equal("CN", ary[2][0]) - assert_equal("emailAddress", ary[3][0]) - assert_equal("serialNumber", ary[4][0]) + if OpenSSL::OPENSSL_VERSION_NUMBER < 0x00907000 + assert_equal("Email", ary[3][0]) + assert_equal("SN", ary[4][0]) + else + assert_equal("emailAddress", ary[3][0]) + assert_equal("serialNumber", ary[4][0]) + end assert_equal("org", ary[0][1]) assert_equal("ruby-lang", ary[1][1]) assert_equal("GOTOU Yuuzou", ary[2][1]) |