mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/openssl/ossl_config.c: OpenSSL 1.0.0 support.
* ext/openssl/extconf.rb: check some functions added/removed at OpenSSL 1.0.0. * ext/openssl/ossl_engine.c (ossl_engine_s_load): use engines which exists. * ext/openssl/ossl_ssl_session (SSL_SESSION_cmp): removed at 1.0.0, so implement compatible fuction here. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a909ff22c8
commit
6f7b5ffe6f
5 changed files with 64 additions and 9 deletions
|
|
@ -61,16 +61,34 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
|
|||
}
|
||||
StringValue(name);
|
||||
#ifndef OPENSSL_NO_STATIC_ENGINE
|
||||
#if HAVE_ENGINE_LOAD_DYNAMIC
|
||||
OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_CSWIFT
|
||||
OSSL_ENGINE_LOAD_IF_MATCH(cswift);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_CHIL
|
||||
OSSL_ENGINE_LOAD_IF_MATCH(chil);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_ATALLA
|
||||
OSSL_ENGINE_LOAD_IF_MATCH(atalla);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_NURON
|
||||
OSSL_ENGINE_LOAD_IF_MATCH(nuron);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_UBSEC
|
||||
OSSL_ENGINE_LOAD_IF_MATCH(ubsec);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_AEP
|
||||
OSSL_ENGINE_LOAD_IF_MATCH(aep);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_SUREWARE
|
||||
OSSL_ENGINE_LOAD_IF_MATCH(sureware);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_4758CCA
|
||||
OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
|
||||
#endif
|
||||
#endif
|
||||
#ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
|
||||
OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue