diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-31 05:09:24 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-31 05:09:24 +0000 |
commit | 0a57886cca5ebc2743ba15ba7d1299e7a04174ec (patch) | |
tree | cccec8378ae1d7cf8e9d005b573732caab2c5fe4 | |
parent | b7891928a33f7f6452f5e51858144e822e11a9cb (diff) | |
download | ruby-0a57886cca5ebc2743ba15ba7d1299e7a04174ec.tar.gz |
* ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
value. [ruby-dev:25971]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/openssl/ossl_engine.c | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Mar 31 14:08:43 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> + + * ext/openssl/ossl_engine.c (ossl_engine_s_load): should return + value. [ruby-dev:25971] + Thu Mar 31 11:07:50 2005 Kouhei Sutou <kou@cozmixng.org> * lib/rss/parser.rb: @@setter -> @@setters. diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c index 5b58c4f1e6..c3f3dc4014 100644 --- a/ext/openssl/ossl_engine.c +++ b/ext/openssl/ossl_engine.c @@ -55,7 +55,10 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass) VALUE name; rb_scan_args(argc, argv, "01", &name); - if(NIL_P(name)) ENGINE_load_builtin_engines(); + if(NIL_P(name)){ + ENGINE_load_builtin_engines(); + return Qtrue; + } StringValue(name); OSSL_ENGINE_LOAD_IF_MATCH(openssl); OSSL_ENGINE_LOAD_IF_MATCH(dynamic); @@ -70,7 +73,8 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass) #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto); #endif - rb_warning("no such engine `%s'", RSTRING(name)->ptr); + rb_warning("no such builtin loader for `%s'", RSTRING(name)->ptr); + return Qnil; #endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */ } |