mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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/branches/ruby_1_8@8229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
46378ac4ff
commit
36aca6e1a5
1 changed files with 6 additions and 2 deletions
|
@ -55,7 +55,10 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
|
||||||
VALUE name;
|
VALUE name;
|
||||||
|
|
||||||
rb_scan_args(argc, argv, "01", &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);
|
StringValue(name);
|
||||||
OSSL_ENGINE_LOAD_IF_MATCH(openssl);
|
OSSL_ENGINE_LOAD_IF_MATCH(openssl);
|
||||||
OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
|
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
|
#ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
|
||||||
OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
|
OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
|
||||||
#endif
|
#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 */
|
#endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue