From b502b16eb64b7bace9d39cf4f319733023c7c2be Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Sat, 23 Jul 2005 07:50:17 +0000 Subject: [PATCH] * ext/openssl/ossl_engine.c (ossl_engine_s_load): should check OPENSSL_NO_STATIC_ENGINE. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/openssl/ossl_engine.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 39aef86bdc..5fca97dcb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jul 23 16:48:12 2005 GOTOU Yuuzou + + * ext/openssl/ossl_engine.c (ossl_engine_s_load): should check + OPENSSL_NO_STATIC_ENGINE. + Sat Jul 23 11:46:30 2005 Tanaka Akira * eval.c (rb_fd_select): the all three fd_sets must be long enough for diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c index c3f3dc4014..d2633118c9 100644 --- a/ext/openssl/ossl_engine.c +++ b/ext/openssl/ossl_engine.c @@ -60,7 +60,7 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass) return Qtrue; } StringValue(name); - OSSL_ENGINE_LOAD_IF_MATCH(openssl); +#ifndef OPENSSL_NO_STATIC_ENGINE OSSL_ENGINE_LOAD_IF_MATCH(dynamic); OSSL_ENGINE_LOAD_IF_MATCH(cswift); 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(sureware); OSSL_ENGINE_LOAD_IF_MATCH(4758cca); +#endif #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto); #endif + OSSL_ENGINE_LOAD_IF_MATCH(openssl); rb_warning("no such builtin loader for `%s'", RSTRING(name)->ptr); return Qnil; #endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */