diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509name.c | 15 | ||||
| -rw-r--r-- | test/openssl/test_x509name.rb | 51 |
3 files changed, 74 insertions, 6 deletions
@@ -1,14 +1,24 @@ +Wed Feb 8 13:12:02 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> + + * ext/openssl/ossl_x509name.c: Use the numerical representation of + unrecognized OIDs instead of the sn "UNDEF". + + * test/openssl/test_x509name.rb: Add tests for the fixed behavior. + + Patch provided by Paul Kehrer, thank you! + [ruby-core:41769] [Feature #5787] + Wed Feb 8 09:49:58 2012 NARUSE, Yui <naruse@ruby-lang.org> * tool/merger.rb: don't abort, update first. -Wed Feb 08 09:57:33 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> +Wed Feb 8 09:47:33 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> * ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString. Thanks to Mantas Mikulenas for noticing and providing a patch! [ruby-core:42358] [Bug #5972] -Wed Feb 08 09:19:00 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> +Wed Feb 8 09:19:00 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> * ext/openssl/ossl_cipher.c: Add warning about key as IV. diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c index 13e18eecf1..247b3c724a 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -227,10 +227,10 @@ ossl_x509name_to_a(VALUE self) { X509_NAME *name; X509_NAME_ENTRY *entry; - int i,entries; + int i,entries,nid; char long_name[512]; const char *short_name; - VALUE ary, ret; + VALUE ary, vname, ret; GetX509Name(self, name); entries = X509_NAME_entry_count(name); @@ -246,8 +246,15 @@ ossl_x509name_to_a(VALUE self) if (!i2t_ASN1_OBJECT(long_name, sizeof(long_name), entry->object)) { ossl_raise(eX509NameError, NULL); } - short_name = OBJ_nid2sn(OBJ_ln2nid(long_name)); - ary = rb_ary_new3(3, rb_str_new2(short_name), + nid = OBJ_ln2nid(long_name); + if (nid == NID_undef) { + vname = rb_str_new2((const char *) &long_name); + } else { + short_name = OBJ_nid2sn(nid); + vname = rb_str_new2(short_name); /*do not free*/ + } + ary = rb_ary_new3(3, + vname, rb_str_new((const char *)entry->value->data, entry->value->length), INT2FIX(entry->value->type)); rb_ary_push(ret, ary); diff --git a/test/openssl/test_x509name.rb b/test/openssl/test_x509name.rb index cf5a8b0ab4..6443eea6f7 100644 --- a/test/openssl/test_x509name.rb +++ b/test/openssl/test_x509name.rb @@ -100,6 +100,57 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase assert_equal(name_from_der.to_der, name.to_der) end + def test_unrecognized_oid + dn = [ ["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 = 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", 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("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]) + end + + def test_unrecognized_oid_parse_encode_equality + dn = [ ["1.2.3.4.5.6.7.8.9.7.5.3.2", "Unknown OID1"], + ["1.1.2.3.5.8.13.21.35", "Unknown OID2"], + ["C", "US"], + ["postalCode", "60602"], + ["ST", "Illinois"], + ["L", "Chicago"], + ["street", "123 Fake St"], + ["O", "Some Company LLC"], + ["CN", "mydomain.com"] ] + + name1 = OpenSSL::X509::Name.new(dn) + name2 = OpenSSL::X509::Name.parse(name1.to_s) + assert_equal(name1.to_s, name2.to_s) + assert_equal(name1.to_a, name2.to_a) + end + def test_s_parse dn = "/DC=org/DC=ruby-lang/CN=www.ruby-lang.org" name = OpenSSL::X509::Name.parse(dn) |