Commit ea7736a0 authored by Rich Salz's avatar Rich Salz
Browse files

No dynamic-init fix; merge goof. 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 907d2c2f

crypto/init.c

+0 −1
Original line number Diff line number Diff line
@@ -604,7 +604,6 @@ void OPENSSL_INIT_library_stop(void) 
    CONF_modules_free();

    RAND_cleanup();

    base_inited = 0;

    OPENSSL_INIT_ONCE_DYNAMIC_INIT(&base);

}



static const OPENSSL_INIT_SETTINGS *ossl_init_get_setting(