diff options
| author | Matt Caswell <matt@openssl.org> | 2016-02-09 11:26:14 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-02-09 15:11:38 +0000 |
| commit | b184e3ef73200cb3b7914a603b43a5b8a074c85f (patch) | |
| tree | 95533e5aa6e9a0ae6e17605fc76441324cdc8ee9 /util | |
| parent | bc66265da8f4c8830cfaf229c985bc391075aa9d (diff) | |
| download | openssl-b184e3ef73200cb3b7914a603b43a5b8a074c85f.tar.gz | |
Provide framework for auto initialise/deinitialise of the library
This commit provides the basis and core code for an auto initialisation
and deinitialisation framework for libcrypto and libssl. The intention is
to remove the need (in many circumstances) to call explicit initialise and
deinitialise functions. Explicit initialisation will still be an option,
and if non-default initialisation is needed then it will be required.
Similarly for de-initialisation (although this will be a lot easier since
it will bring all de-initialisation into a single function).
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/libeay.num | 3 | ||||
| -rwxr-xr-x | util/mk1mf.pl | 5 | ||||
| -rwxr-xr-x | util/ssleay.num | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/util/libeay.num b/util/libeay.num index e0f95590b7..b937a44dba 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4812,3 +4812,6 @@ PKCS8_get_attr 5206 1_1_0 EXIST::FUNCTION: PKCS12_SAFEBAG_get0_attr 5207 1_1_0 EXIST::FUNCTION: PKCS12_get0_mac 5208 1_1_0 EXIST::FUNCTION: PKCS12_SAFEBAG_get0_pkcs8 5209 1_1_0 EXIST::FUNCTION: +OPENSSL_INIT_library_stop 5210 1_1_0 EXIST::FUNCTION: +OPENSSL_INIT_register_stop_handler 5211 1_1_0 EXIST::FUNCTION: +OPENSSL_INIT_crypto_library_start 5212 1_1_0 EXIST::FUNCTION: diff --git a/util/mk1mf.pl b/util/mk1mf.pl index ed1d0e1959..e7cbea883d 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -142,7 +142,8 @@ and [options] can be one of no-engine - No engine no-egd - No EGD no-hw - No hw - no-async - No Async (use NULL) + no-async - No Async (use NULL) + no-autoalginit - Don't auto load algorithms in libcrypto nasm - Use NASM for x86 asm nw-nasm - Use NASM x86 asm for NetWare nw-mwasm - Use Metrowerks x86 asm for NetWare @@ -298,6 +299,7 @@ $cflags.=" -DOPENSSL_NO_GOST" if $no_gost; $cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine; $cflags.=" -DOPENSSL_NO_HW" if $no_hw; $cflags.=" -DOPENSSL_NO_ASYNC" if $no_async; +$cflags.=" -DOPENSSL_NO_AUTOALGINIT" if $no_autoalginit; $cflags.=" -DOPENSSL_FIPS" if $fips; $cflags.=" -DOPENSSL_NO_JPAKE" if $no_jpake; $cflags.=" -DOPENSSL_NO_EC2M" if $no_ec2m; @@ -1414,6 +1416,7 @@ sub read_options "no-egd" => 0, "no-hw" => \$no_hw, "no-async" => \$no_async, + "no-autoalginit" => \$no_autoalginit, "just-ssl" => [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast, \$no_md2, \$no_mdc2, \$no_dsa, \$no_dh, diff --git a/util/ssleay.num b/util/ssleay.num index d320e3bbd4..e06ae98f56 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -437,3 +437,4 @@ SSL_up_ref 471 1_1_0 EXIST::FUNCTION: SSL_CTX_up_ref 472 1_1_0 EXIST::FUNCTION: DTLSv1_listen 473 1_1_0 EXIST::FUNCTION: SSL_get0_verified_chain 474 1_1_0 EXIST::FUNCTION: +OPENSSL_INIT_ssl_library_start 475 1_1_0 EXIST::FUNCTION: |