diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-14 13:06:51 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-14 13:06:51 +0000 |
| commit | b848d4f9c8859ad2d37c9523759366d9b24f0464 (patch) | |
| tree | eb65ff07c510201f05c3fc9d3cbf40cc372b26aa | |
| parent | 158a828c97ac00799533d942f90a31f712b9290a (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/ossl_pkey.c | 1 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509cert.c | 1 |
3 files changed, 9 insertions, 0 deletions
@@ -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 diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c index cb0c320a0c..15a2eed8d2 100644 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c @@ -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); diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c index b71025e145..3093d60f1f 100644 --- a/ext/openssl/ossl_x509cert.c +++ b/ext/openssl/ossl_x509cert.c @@ -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... |