diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509store.c | 19 |
2 files changed, 12 insertions, 12 deletions
@@ -1,3 +1,8 @@ +Sat May 28 05:15:44 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> + + * ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should + not set internal flag directry. + Sat May 28 02:00:11 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c index b08f90cde8..5dba733878 100644 --- a/ext/openssl/ossl_x509store.c +++ b/ext/openssl/ossl_x509store.c @@ -358,7 +358,7 @@ static VALUE ossl_x509stctx_set_time(VALUE, VALUE); static VALUE ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self) { - VALUE store, cert, chain; + VALUE store, cert, chain, t; X509_STORE_CTX *ctx; X509_STORE *x509st; X509 *x509 = NULL; @@ -380,7 +380,8 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self) ossl_x509stctx_set_purpose(self, rb_iv_get(store, "@purpose")); ossl_x509stctx_set_trust(self, rb_iv_get(store, "@trust")); #endif - ossl_x509stctx_set_time(self, rb_iv_get(store, "@time")); + if (!NIL_P(t = rb_iv_get(store, "@time"))) + ossl_x509stctx_set_time(self, t); rb_iv_set(self, "@verify_callback", rb_iv_get(store, "@verify_callback")); rb_iv_set(self, "@cert", cert); @@ -546,17 +547,11 @@ static VALUE ossl_x509stctx_set_time(VALUE self, VALUE time) { X509_STORE_CTX *store; + long t; - if(NIL_P(time)) { - GetX509StCtx(self, store); - store->flags &= ~X509_V_FLAG_USE_CHECK_TIME; - } - else { - long t = NUM2LONG(rb_Integer(time)); - - GetX509StCtx(self, store); - X509_STORE_CTX_set_time(store, 0, t); - } + t = NUM2LONG(rb_Integer(time)); + GetX509StCtx(self, store); + X509_STORE_CTX_set_time(store, 0, t); return time; } |