diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2018-08-08 19:00:03 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2018-08-08 19:01:12 +0900 |
commit | ce4022d4502fa6896db762403213d3267593446d (patch) | |
tree | 3f4ea3e79995d88e7da3c957d0d97a359c8c5253 /ext | |
parent | 158201f9b66607f380513708e3ab65f1e27694e6 (diff) | |
parent | 307db4904bd6f911b3d9f5ee0066da4763a77983 (diff) | |
download | ruby-openssl-ce4022d4502fa6896db762403213d3267593446d.tar.gz |
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
Diffstat (limited to 'ext')
-rw-r--r-- | ext/openssl/ossl_x509name.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c index 0f16736c..5869d633 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -250,14 +250,12 @@ 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 @@ -265,12 +263,14 @@ 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"); } |