Commit 31305cdf authored by Viktor Dukhovni's avatar Viktor Dukhovni
Browse files

Fixes to make no-deprecated work again 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 6762a147

crypto/conf/conf_sap.c

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 


static int openssl_configured = 0;



#if OPENSSL_API_COMPAT < 0x10100000L

void OPENSSL_config(const char *config_name)

{

    OPENSSL_INIT_SETTINGS settings;
@@ -83,6 +84,7 @@ void OPENSSL_config(const char *config_name) 
    settings.config_name = strdup(config_name);

    OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, &settings);

}

#endif



void openssl_config_internal(const char *config_name)

{

crypto/engine/eng_all.c

+3 −29
Original line number Diff line number Diff line
@@ -63,34 +63,8 @@ void ENGINE_load_builtin_engines(void) 
{

    /* Some ENGINEs need this */

    OPENSSL_cpuid_setup();

#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))

# ifdef ENGINE_load_cryptodev

    ENGINE_load_cryptodev();

# endif

#endif

#ifndef OPENSSL_NO_RDRAND

# ifdef ENGINE_load_rdrand

    ENGINE_load_rdrand();

# endif

#endif

# ifdef ENGINE_load_dynamic

    ENGINE_load_dynamic();

# endif

#ifndef OPENSSL_NO_STATIC_ENGINE

# ifndef OPENSSL_NO_HW

#  ifndef OPENSSL_NO_HW_PADLOCK

#   ifdef ENGINE_load_padlock

    ENGINE_load_padlock();

#   endif

#  endif

# endif

# if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)

#  ifdef ENGINE_load_capi

    ENGINE_load_capi();

#  endif

# endif

#endif

    ENGINE_register_all_complete();



    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);

}



#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
@@ -98,7 +72,7 @@ void ENGINE_setup_bsd_cryptodev(void) 
{

    static int bsd_cryptodev_default_loaded = 0;

    if (!bsd_cryptodev_default_loaded) {

        ENGINE_load_cryptodev();

        OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CRYPTODEV, NULL);

        ENGINE_register_all_complete();

    }

    bsd_cryptodev_default_loaded = 1;

crypto/init.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 


#include <internal/cryptlib_int.h>

#include <openssl/err.h>

#include <openssl/rand.h>

#include <openssl/evp.h>

#include <internal/evp_int.h>

#include <internal/conf.h>