diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-10 12:17:23 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-10 12:17:23 +0000 |
| commit | 95a7aabe1eb2857fae419cd9f408e16a35653019 (patch) | |
| tree | e89f95c19e41cc7c3d92726e3e0361588b01eac3 | |
| parent | 64a12d32d8fc2e7ed46917de872fa9f3778fb9bb (diff) | |
| download | ruby-95a7aabe1eb2857fae419cd9f408e16a35653019.tar.gz | |
merge revision(s) 27064:
* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize
store->ex_data.sk. [ruby-core:28907] [ruby-core:23971]
[ruby-core:18121]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@33999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509store.c | 1 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Mon Oct 17 03:56:12 2011 Yusuke Endoh <mame@tsg.ne.jp> + + * ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize + store->ex_data.sk. [ruby-core:28907] [ruby-core:23971] + [ruby-core:18121] + Thu Jun 30 12:52:56 2011 WATANABE Hirofumi <eban@ruby-lang.org> * ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw. diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c index 769ce8a91a..cd30226277 100644 --- a/ext/openssl/ossl_x509store.c +++ b/ext/openssl/ossl_x509store.c @@ -131,6 +131,7 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self) /* BUG: This method takes any number of arguments but appears to ignore them. */ GetX509Store(self, store); + store->ex_data.sk = NULL; X509_STORE_set_verify_cb_func(store, ossl_verify_cb); ossl_x509store_set_vfy_cb(self, Qnil); |