1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/openssl/ossl_pkey.c (ossl_pkey_new_from_file): set close-on-exec

flag.

* ext/openssl/ossl_x509cert.c (rb_fd_fix_cloexec): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-11-14 13:06:51 +00:00
parent 158a828c97
commit b848d4f9c8
3 changed files with 9 additions and 0 deletions

View file

@ -1,3 +1,10 @@
Mon Nov 14 22:06:02 2011 Tanaka Akira <akr@fsij.org>
* ext/openssl/ossl_pkey.c (ossl_pkey_new_from_file): set close-on-exec
flag.
* ext/openssl/ossl_x509cert.c (rb_fd_fix_cloexec): ditto.
Mon Nov 14 14:54:17 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* bignum.c (rb_big2ull): fix 32bit platform breakage. we must

View file

@ -111,6 +111,7 @@ ossl_pkey_new_from_file(VALUE filename)
if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
ossl_raise(ePKeyError, "%s", strerror(errno));
}
rb_fd_fix_cloexec(fileno(fp));
pkey = PEM_read_PrivateKey(fp, NULL, ossl_pem_passwd_cb, NULL);
fclose(fp);

View file

@ -66,6 +66,7 @@ ossl_x509_new_from_file(VALUE filename)
if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
ossl_raise(eX509CertError, "%s", strerror(errno));
}
rb_fd_fix_cloexec(fileno(fp));
x509 = PEM_read_X509(fp, NULL, NULL, NULL);
/*
* prepare for DER...