Merge branch 'maint-2.0' into maint

* maint-2.0:
  x509name: fix handling of X509_NAME_{oneline,print_ex}() return value
  x509name: refactor OpenSSL::X509::Name#to_s
  test/test_x509name: change script encoding to ASCII-8BIT

Author: rhenium

ext/openssl/ossl_x509name.c

@@ -250,27 +250,27 @@ ossl_x509name_to_s_old(VALUE self)
 {
     X509_NAME *name;
     char *buf;
-    VALUE str;
 
     GetX509Name(self, name);
     buf = X509_NAME_oneline(name, NULL, 0);
-    str = rb_str_new2(buf);
-    OPENSSL_free(buf);
-
-    return str;
+    if (!buf)
+	ossl_raise(eX509NameError, "X509_NAME_oneline");
+    return ossl_buf2str(buf, rb_long2int(strlen(buf)));
 }
 
 static VALUE
 x509name_print(VALUE self, unsigned long iflag)
 {
     X509_NAME *name;
     BIO *out;
+    int ret;
 
     GetX509Name(self, name);
     out = BIO_new(BIO_s_mem());
     if (!out)
 	ossl_raise(eX509NameError, NULL);
-    if (!X509_NAME_print_ex(out, name, 0, iflag)) {
+    ret = X509_NAME_print_ex(out, name, 0, iflag);
+    if (ret < 0 || iflag == XN_FLAG_COMPAT && ret == 0) {
 	BIO_free(out);
 	ossl_raise(eX509NameError, "X509_NAME_print_ex");
     }

test/test_x509name.rb

@@ -371,6 +371,12 @@ def test_to_s
     assert_equal "DC = org, DC = ruby-lang, " \
       "CN = \"\\E3\\83\\95\\E3\\83\\BC, \\E3\\83\\90\\E3\\83\\BC\"",
       name.to_s(OpenSSL::X509::Name::ONELINE)
+
+    empty = OpenSSL::X509::Name.new
+    assert_equal "", empty.to_s
+    assert_equal "", empty.to_s(OpenSSL::X509::Name::COMPAT)
+    assert_equal "", empty.to_s(OpenSSL::X509::Name::RFC2253)
+    assert_equal "", empty.to_s(OpenSSL::X509::Name::ONELINE)
   end
 
   def test_to_utf8
@@ -386,6 +392,9 @@ def test_to_utf8
     expected = "CN=フー\\, バー,DC=ruby-lang,DC=org".force_encoding("UTF-8")
     assert_equal expected, str
     assert_equal Encoding.find("UTF-8"), str.encoding
+
+    empty = OpenSSL::X509::Name.new
+    assert_equal "", empty.to_utf8
   end
 
   def test_equals2