X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=crypto%2Fconf%2Fconf_sap.c;h=3d2e065e5b07c54d42c46b11d8f0830fe257bdaf;hb=2d1b5717b9fd3ed54b663334e18c006d34776328;hp=a1c25b3ee6765acc5038f4e99769c9339ac99ac2;hpb=6286757141a8c6e14d647ec733634ae0c83d9887;p=openssl.git diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index a1c25b3ee6..3d2e065e5b 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -10,11 +10,15 @@ #include #include #include "internal/cryptlib.h" -#include +#include "internal/conf.h" #include #include #include +#ifdef _WIN32 +# define strdup _strdup +#endif + /* * This is the automatic configuration loader: it is called automatically by * OpenSSL when any of a number of standard initialisation functions are @@ -24,18 +28,18 @@ static int openssl_configured = 0; #if OPENSSL_API_COMPAT < 0x10100000L -void OPENSSL_config(const char *config_name) +void OPENSSL_config(const char *appname) { OPENSSL_INIT_SETTINGS settings; memset(&settings, 0, sizeof(settings)); - if (config_name != NULL) - settings.config_name = strdup(config_name); + if (appname != NULL) + settings.appname = strdup(appname); OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, &settings); } #endif -void openssl_config_int(const char *config_name) +void openssl_config_int(const char *appname) { if (openssl_configured) return; @@ -47,7 +51,7 @@ void openssl_config_int(const char *config_name) #endif ERR_clear_error(); #ifndef OPENSSL_SYS_UEFI - CONF_modules_load_file(NULL, config_name, + CONF_modules_load_file(NULL, appname, CONF_MFLAGS_DEFAULT_SECTION | CONF_MFLAGS_IGNORE_MISSING_FILE); #endif