diff options
Diffstat (limited to 'test/openssl/test_x509name.rb')
| -rw-r--r-- | test/openssl/test_x509name.rb | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/test/openssl/test_x509name.rb b/test/openssl/test_x509name.rb index 8d6d9cb534..fb5a1ae4ff 100644 --- a/test/openssl/test_x509name.rb +++ b/test/openssl/test_x509name.rb @@ -7,6 +7,11 @@ require "test/unit" if defined?(OpenSSL) class OpenSSL::TestX509Name < Test::Unit::TestCase + OpenSSL::ASN1::ObjectId.register( + "1.2.840.113549.1.9.1", "emailAddress", "emailAddress") + OpenSSL::ASN1::ObjectId.register( + "2.5.4.5", "serialNumber", "serialNumber") + def setup @obj_type_tmpl = Hash.new(OpenSSL::ASN1::PRINTABLESTRING) @obj_type_tmpl.update(OpenSSL::X509::Name::OBJECT_TYPE_TEMPLATE) @@ -76,21 +81,12 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase ] name = OpenSSL::X509::Name.new(dn) ary = name.to_a - 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=org/DC=ruby-lang/CN=GOTOU Yuuzou/emailAddress=gotoyuzo@ruby-lang.org/serialNumber=123", name.to_s) assert_equal("DC", ary[0][0]) assert_equal("DC", ary[1][0]) assert_equal("CN", ary[2][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("emailAddress", ary[3][0]) + assert_equal("serialNumber", ary[4][0]) assert_equal("org", ary[0][1]) assert_equal("ruby-lang", ary[1][1]) assert_equal("GOTOU Yuuzou", ary[2][1]) @@ -248,21 +244,12 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase name = OpenSSL::X509::Name.new dn.each{|attr| name.add_entry(*attr) } ary = name.to_a - 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=org/DC=ruby-lang/CN=GOTOU Yuuzou/emailAddress=gotoyuzo@ruby-lang.org/serialNumber=123", name.to_s) assert_equal("DC", ary[0][0]) assert_equal("DC", ary[1][0]) assert_equal("CN", ary[2][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("emailAddress", ary[3][0]) + assert_equal("serialNumber", ary[4][0]) assert_equal("org", ary[0][1]) assert_equal("ruby-lang", ary[1][1]) assert_equal("GOTOU Yuuzou", ary[2][1]) |