first step of v2 final release

This commit is contained in:
Zhi Guan
2017-11-05 21:00:36 +08:00
parent 480b9e8d88
commit 27bde477a5
395 changed files with 26341 additions and 31364 deletions

View File

@@ -294,6 +294,30 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_capi)
return 1;
}
# endif
# if !defined(OPENSSL_NO_SKF) && !defined(OPENSSL_NO_SKFENG)
static CRYPTO_ONCE engine_skf = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(ossl_init_engine_skf)
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_skf: "
"engine_load_skf_int()\n");
# endif
engine_load_skf_int();
return 1;
}
# endif
# if !defined(OPENSSL_NO_SDF) && !defined(OPENSSL_NO_SDFENG)
static CRYPTO_ONCE engine_sdf = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(ossl_init_engine_sdf)
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_sdf: "
"engine_load_sdf_int()\n");
# endif
engine_load_sdf_int();
return 1;
}
# endif
# if !defined(OPENSSL_NO_AFALGENG)
static CRYPTO_ONCE engine_afalg = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(ossl_init_engine_afalg)
@@ -585,6 +609,16 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
&& !RUN_ONCE(&engine_capi, ossl_init_engine_capi))
return 0;
# endif
# if !defined(OPENSSL_NO_SKF) && !defined(OPENSSL_NO_SKFENG)
if ((opts & OPENSSL_INIT_ENGINE_SKF)
&& !RUN_ONCE(&engine_skf, ossl_init_engine_skf))
return 0;
# endif
# if !defined(OPENSSL_NO_SDF) && !defined(OPENSSL_NO_SDFENG)
if ((opts & OPENSSL_INIT_ENGINE_SDF)
&& !RUN_ONCE(&engine_sdf, ossl_init_engine_sdf))
return 0;
# endif
# if !defined(OPENSSL_NO_AFALGENG)
if ((opts & OPENSSL_INIT_ENGINE_AFALG)
&& !RUN_ONCE(&engine_afalg, ossl_init_engine_afalg))