1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/openssl/ossl_engine.c (ossl_engine_s_load): should check

Browse Source 
OPENSSL_NO_STATIC_ENGINE.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
gotoyuzo 2005-07-23 07:50:17 +00:00
parent 80914a2666
commit b502b16eb6
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Jul 23 16:48:12 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_engine.c (ossl_engine_s_load): should check
OPENSSL_NO_STATIC_ENGINE.
Sat Jul 23 11:46:30 2005 Tanaka Akira <akr@m17n.org> Sat Jul 23 11:46:30 2005 Tanaka Akira <akr@m17n.org>
* eval.c (rb_fd_select): the all three fd_sets must be long enough for * eval.c (rb_fd_select): the all three fd_sets must be long enough for

4
ext/openssl/ossl_engine.c
View File

@ -60,7 +60,7 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
return Qtrue; return Qtrue;
} }
StringValue(name); StringValue(name);
OSSL_ENGINE_LOAD_IF_MATCH(openssl); #ifndef OPENSSL_NO_STATIC_ENGINE
OSSL_ENGINE_LOAD_IF_MATCH(dynamic); OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
OSSL_ENGINE_LOAD_IF_MATCH(cswift); OSSL_ENGINE_LOAD_IF_MATCH(cswift);
OSSL_ENGINE_LOAD_IF_MATCH(chil); OSSL_ENGINE_LOAD_IF_MATCH(chil);
@ -70,9 +70,11 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
OSSL_ENGINE_LOAD_IF_MATCH(aep); OSSL_ENGINE_LOAD_IF_MATCH(aep);
OSSL_ENGINE_LOAD_IF_MATCH(sureware); OSSL_ENGINE_LOAD_IF_MATCH(sureware);
OSSL_ENGINE_LOAD_IF_MATCH(4758cca); OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
#endif
#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
OSSL_ENGINE_LOAD_IF_MATCH(openssl);
rb_warning("no such builtin loader for `%s'", RSTRING(name)->ptr); rb_warning("no such builtin loader for `%s'", RSTRING(name)->ptr);
return Qnil; return Qnil;
#endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */ #endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */