diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-14 09:09:36 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-14 09:09:36 +0000 |
commit | 1a760a6f76e5b2fad343fce10ebf831fe22286b4 (patch) | |
tree | c29a0ac35e5e332ed59394ee0039bc696b6c1987 | |
parent | b9bfdbb13eebe43e9610092ab0de6117e745d85e (diff) | |
download | ruby-1a760a6f76e5b2fad343fce10ebf831fe22286b4.tar.gz |
* ext/openssl/ossl_asn1.c (ossl_asn1cons_to_der): fix type of
argument. [ruby-dev:23891]
* test/openssl/test_x509store.rb: prune tests for CRL checking
unless X509::V_FLAG_CRL_CHECK is defined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6626 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ext/openssl/ossl_asn1.c | 2 | ||||
-rw-r--r-- | test/openssl/test_x509store.rb | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Wed Jul 14 18:05:21 2004 GOTOU Yuuzou <gotoyuzo@notwork.org> + + * ext/openssl/ossl_asn1.c (ossl_asn1cons_to_der): fix type of + argument. [ruby-dev:23891] + + * test/openssl/test_x509store.rb: prune tests for CRL checking + unless X509::V_FLAG_CRL_CHECK is defined. + Wed Jul 14 12:20:05 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * util.c (ruby_strtod): should not convert string in the form of diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index 7d364712b6..a961c16bc0 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -950,7 +950,7 @@ ossl_asn1prim_to_der(VALUE self) } static VALUE -ossl_asn1cons_to_der(self) +ossl_asn1cons_to_der(VALUE self) { int tag, tn, tc, explicit; long seq_len, length; diff --git a/test/openssl/test_x509store.rb b/test/openssl/test_x509store.rb index 0887bf6ea9..113e81fa52 100644 --- a/test/openssl/test_x509store.rb +++ b/test/openssl/test_x509store.rb @@ -107,6 +107,8 @@ class OpenSSL::TestX509Store < Test::Unit::TestCase assert_equal(false, store.verify(ee3_cert)) assert_match(/expire/i, store.error_string) + return unless defined?(OpenSSL::X509::V_FLAG_CRL_CHECK) + store = OpenSSL::X509::Store.new store.purpose = OpenSSL::X509::PURPOSE_ANY store.flags = OpenSSL::X509::V_FLAG_CRL_CHECK |