From a8ae652eb81f023930e14920440b0e68f0495818 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 10 Dec 2011 12:17:23 +0000 Subject: [PATCH] merge revision(s) 27064: ?\012 * 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 git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@33999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/openssl/ossl_x509store.c | 1 + 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index ce54d1244..62e41b92c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Oct 17 03:56:12 2011 Yusuke Endoh + + * 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 * 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 769ce8a91..cd3022627 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);