aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGOTOU Yuuzou <gotoyuzo@notwork.org>2003-06-29 14:10:52 +0000
committerGOTOU Yuuzou <gotoyuzo@notwork.org>2003-06-29 14:10:52 +0000
commite5428533d6e2bad91d9ffdd0a81efbf7946bc26c (patch)
tree63c0808fa3830ea7e4ca0502757f41430ee0e6a0
parent04462cd4321e1f976a7c0f4628de8f2aea847dde (diff)
downloadruby-openssl-history-e5428533d6e2bad91d9ffdd0a81efbf7946bc26c.tar.gz
ossl_ssl.c: no longer SSL_CTX_set_default_verify_paths is called.
-rw-r--r--ChangeLog3
-rw-r--r--ossl_ssl.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f9fbbcb..d66541e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Sun, 29 Jun 2003 23:07:25 +0900 -- GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ossl_ssl.c: no longer SSL_CTX_set_default_verify_paths is called.
+
Sun, 29 Jun 2003 20:14:00 +0900 -- NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* examples/ca/gen_clientee_from_csr.rb: Typo fixed.
* examples/ca/gen_clientee_from_scratch.rb: Ditto.
diff --git a/ossl_ssl.c b/ossl_ssl.c
index a05c937..48dc893 100644
--- a/ossl_ssl.c
+++ b/ossl_ssl.c
@@ -191,9 +191,9 @@ ossl_sslctx_setup(VALUE self)
ca_file = NIL_P(val) ? NULL : StringValuePtr(val);
val = ossl_sslctx_get_ca_path(self);
ca_path = NIL_P(val) ? NULL : StringValuePtr(val);
- if ((!SSL_CTX_load_verify_locations(ctx, ca_file, ca_path) ||
- !SSL_CTX_set_default_verify_paths(ctx))) {
- rb_warning("can't set verify locations");
+ if(ca_file || ca_path){
+ if (!SSL_CTX_load_verify_locations(ctx, ca_file, ca_path))
+ rb_warning("can't set verify locations");
}
val = ossl_sslctx_get_verify_mode(self);