diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-31 05:16:13 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-31 05:16:13 +0000 |
| commit | c2e6b4d40e13c1096d0d6dc77c85b8de0510c51d (patch) | |
| tree | 71b9420f58151a2164e9d78c4ff81983c2d78770 | |
| parent | c0f5b0ab1ff15022695e93edd61d34dc1a1812c6 (diff) | |
| download | ruby-c2e6b4d40e13c1096d0d6dc77c85b8de0510c51d.tar.gz ruby-c2e6b4d40e13c1096d0d6dc77c85b8de0510c51d.tar.xz ruby-c2e6b4d40e13c1096d0d6dc77c85b8de0510c51d.zip | |
* ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
value. [ruby-dev:25971]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/openssl/ossl_engine.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c index 5b58c4f1e..c3f3dc401 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 */ } |