summaryrefslogtreecommitdiff
path: root/test/openssl/test_x509name.rb
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-08 09:49:36 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-08 09:49:36 +0000
commitf75a30776c38f1f9c0a36cae1639244ceb275a90 (patch)
tree951648ba2e6351937827b479ebd8ccfa592b97a9 /test/openssl/test_x509name.rb
parent3ff2f9f3a32fbd87caab29f7fe163c63ab50e305 (diff)
"street" for X509 Name is not supported before 0.9.8m.
It is added openssl/crypto/objects/obj_mac.h 1.83. http://cvs.openssl.org/rlog?f=openssl/crypto/objects/obj_mac.h git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl/test_x509name.rb')
-rw-r--r--test/openssl/test_x509name.rb37
1 files changed, 28 insertions, 9 deletions
diff --git a/test/openssl/test_x509name.rb b/test/openssl/test_x509name.rb
index 6443eea6f7..3d8bf31467 100644
--- a/test/openssl/test_x509name.rb
+++ b/test/openssl/test_x509name.rb
@@ -107,31 +107,32 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase
["postalCode", "60602"],
["ST", "Illinois"],
["L", "Chicago"],
- ["street", "123 Fake St"],
+ #["street", "123 Fake St"],
["O", "Some Company LLC"],
["CN", "mydomain.com"] ]
name = OpenSSL::X509::Name.new(dn)
ary = name.to_a
- assert_equal("/1.2.3.4.5.6.7.8.9.7.5.3.1=Unknown OID 1/1.1.2.3.5.8.13.21.34=Unknown OID 2/C=US/postalCode=60602/ST=Illinois/L=Chicago/street=123 Fake St/O=Some Company LLC/CN=mydomain.com", name.to_s)
+ #assert_equal("/1.2.3.4.5.6.7.8.9.7.5.3.1=Unknown OID 1/1.1.2.3.5.8.13.21.34=Unknown OID 2/C=US/postalCode=60602/ST=Illinois/L=Chicago/street=123 Fake St/O=Some Company LLC/CN=mydomain.com", name.to_s)
+ assert_equal("/1.2.3.4.5.6.7.8.9.7.5.3.1=Unknown OID 1/1.1.2.3.5.8.13.21.34=Unknown OID 2/C=US/postalCode=60602/ST=Illinois/L=Chicago/O=Some Company LLC/CN=mydomain.com", name.to_s)
assert_equal("1.2.3.4.5.6.7.8.9.7.5.3.1", ary[0][0])
assert_equal("1.1.2.3.5.8.13.21.34", ary[1][0])
assert_equal("C", ary[2][0])
assert_equal("postalCode", ary[3][0])
assert_equal("ST", ary[4][0])
assert_equal("L", ary[5][0])
- assert_equal("street", ary[6][0])
- assert_equal("O", ary[7][0])
- assert_equal("CN", ary[8][0])
+ #assert_equal("street", ary[6][0])
+ assert_equal("O", ary[6][0])
+ assert_equal("CN", ary[7][0])
assert_equal("Unknown OID 1", ary[0][1])
assert_equal("Unknown OID 2", ary[1][1])
assert_equal("US", ary[2][1])
assert_equal("60602", ary[3][1])
assert_equal("Illinois", ary[4][1])
assert_equal("Chicago", ary[5][1])
- assert_equal("123 Fake St", ary[6][1])
- assert_equal("Some Company LLC", ary[7][1])
- assert_equal("mydomain.com", ary[8][1])
+ #assert_equal("123 Fake St", ary[6][1])
+ assert_equal("Some Company LLC", ary[6][1])
+ assert_equal("mydomain.com", ary[7][1])
end
def test_unrecognized_oid_parse_encode_equality
@@ -141,7 +142,7 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase
["postalCode", "60602"],
["ST", "Illinois"],
["L", "Chicago"],
- ["street", "123 Fake St"],
+ #["street", "123 Fake St"],
["O", "Some Company LLC"],
["CN", "mydomain.com"] ]
@@ -309,6 +310,24 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase
assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[4][2])
end
+ def test_add_entry_street
+ return if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x009080df # 0.9.8m
+ # openssl/crypto/objects/obj_mac.h 1.83
+ dn = [
+ ["DC", "org"],
+ ["DC", "ruby-lang"],
+ ["CN", "GOTOU Yuuzou"],
+ ["emailAddress", "gotoyuzo@ruby-lang.org"],
+ ["serialNumber", "123"],
+ ["street", "Namiki"],
+ ]
+ 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/street=Namiki", name.to_s)
+ assert_equal("Namiki", ary[5][1])
+ end
+
def test_equals2
n1 = OpenSSL::X509::Name.parse 'CN=a'
n2 = OpenSSL::X509::Name.parse 'CN=a'