From d1e9636e8ff05851b66d074d10900185c92df788 Mon Sep 17 00:00:00 2001
From: matz <matz@ruby-lang.org>
Date: Wed, 15 Dec 2004 06:35:55 +0000
Subject: * lib/set.rb (Set#==): [ruby-dev:25206]

* ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198]

* utf8.c (utf8_is_mbc_ambiguous): [ruby-talk:123561]

* utf8.c (utf8_mbc_to_normalize): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/openssl/ossl_x509store.c | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'ext/openssl/ossl_x509store.c')

diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
index debaef0..cf1a2cd 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -146,9 +146,10 @@ ossl_x509store_set_flags(VALUE self, VALUE flags)
 {
 #if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
     X509_STORE *store;
+    long f = NUM2LONG(flags);
 
     GetX509Store(self, store);
-    X509_STORE_set_flags(store, NUM2LONG(flags));
+    X509_STORE_set_flags(store, f);
 #else
     rb_iv_set(self, "@flags", flags);
 #endif
@@ -161,9 +162,10 @@ ossl_x509store_set_purpose(VALUE self, VALUE purpose)
 {
 #if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
     X509_STORE *store;
+    long p = NUM2LONG(purpose);
     
     GetX509Store(self, store);
-    X509_STORE_set_purpose(store, NUM2LONG(purpose));
+    X509_STORE_set_purpose(store, p);
 #else
     rb_iv_set(self, "@purpose", purpose);
 #endif
@@ -176,9 +178,10 @@ ossl_x509store_set_trust(VALUE self, VALUE trust)
 {
 #if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
     X509_STORE *store;
+    long t = NUM2LONG(trust);
 
     GetX509Store(self, store);
-    X509_STORE_set_trust(store, NUM2LONG(trust));
+    X509_STORE_set_trust(store, t);
 #else
     rb_iv_set(self, "@trust", trust);
 #endif
@@ -350,8 +353,8 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
     X509 *x509 = NULL;
     STACK_OF(X509) *x509s = NULL;
 
-    GetX509StCtx(self, ctx);
     rb_scan_args(argc, argv, "12", &store, &cert, &chain);
+    GetX509StCtx(self, ctx);
     SafeGetX509Store(store, x509st);
     if(!NIL_P(cert)) x509 = DupX509CertPtr(cert); /* NEED TO DUP */
     if(!NIL_P(chain)) x509s = ossl_x509_ary2sk(chain);
@@ -496,9 +499,10 @@ static VALUE
 ossl_x509stctx_set_flags(VALUE self, VALUE flags)
 {
     X509_STORE_CTX *store;
+    long f = NUM2LONG(flags);
 
     GetX509StCtx(self, store);
-    X509_STORE_CTX_set_flags(store, NUM2LONG(flags));
+    X509_STORE_CTX_set_flags(store, f);
 
     return flags;
 }
@@ -507,9 +511,10 @@ static VALUE
 ossl_x509stctx_set_purpose(VALUE self, VALUE purpose)
 {
     X509_STORE_CTX *store;
+    long p = NUM2LONG(purpose);
 
     GetX509StCtx(self, store);
-    X509_STORE_CTX_set_purpose(store, NUM2LONG(purpose));
+    X509_STORE_CTX_set_purpose(store, p);
 
     return purpose;
 }
@@ -518,9 +523,10 @@ static VALUE
 ossl_x509stctx_set_trust(VALUE self, VALUE trust)
 {
     X509_STORE_CTX *store;
+    long t = NUM2LONG(trust);
 
     GetX509StCtx(self, store);
-    X509_STORE_CTX_set_trust(store, NUM2LONG(trust));
+    X509_STORE_CTX_set_trust(store, t);
 
     return trust;
 }
@@ -530,9 +536,16 @@ ossl_x509stctx_set_time(VALUE self, VALUE time)
 {
     X509_STORE_CTX *store;
 
-    GetX509StCtx(self, store);
-    if(NIL_P(time)) store->flags &= ~X509_V_FLAG_USE_CHECK_TIME;
-    else X509_STORE_CTX_set_time(store, 0, NUM2LONG(rb_Integer(time)));
+    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);
+    }
 
     return time;
 }
-- 
cgit v1.2.3