Commit f672aee4 authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Rename INIT funtions, deprecate old ones. 



Man, there were a lot of renamings :)

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent ea7736a0

apps/openssl.c

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int apps_startup() 
#endif



    /* Set non-default library initialisation settings */

    OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ENGINE_ALL_BUILTIN

    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN

                        | OPENSSL_INIT_LOAD_CONFIG, NULL);



    setup_ui_method();

crypto/async/async.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ err: 


static async_ctx *async_get_ctx(void)

{

    OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ASYNC, NULL);

    OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL);

    return async_arch_get_ctx();

}
@@ -361,7 +361,7 @@ int ASYNC_init_thread(size_t max_size, size_t init_size) 
        return 0;

    }



    OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ASYNC, NULL);

    OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL);

    if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC)) {

        ASYNCerr(ASYNC_F_ASYNC_INIT_THREAD, ERR_R_MALLOC_FAILURE);

        return 0;

crypto/comp/c_zlib.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ COMP_METHOD *COMP_zlib(void) 
                zlib_loaded++;

            if (zlib_loaded)

                meth = &zlib_stateful_method;

            OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ZLIB, NULL);

            OPENSSL_init_crypto(OPENSSL_INIT_ZLIB, NULL);

        }

    }

#endif

crypto/conf/conf_sap.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void OPENSSL_config(const char *config_name) 
    settings[0].value.type_string = config_name;

    settings[1].name = OPENSSL_INIT_SET_END;

    settings[1].value.type_int = 0;

    OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_LOAD_CONFIG, settings);

    OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, settings);

}



void openssl_config_internal(const char *config_name)

crypto/cryptlib.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) 
    case DLL_THREAD_ATTACH:

        break;

    case DLL_THREAD_DETACH:

        OPENSSL_INIT_thread_stop();

        OPENSSL_thread_stop();

        break;

    case DLL_PROCESS_DETACH:

        break;