diff --git a/ChangeLog b/ChangeLog
index a4d67e17c5..910d7988b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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