mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
df1f538f28
1. In addition to overriding the default application name,
one can now also override the configuration file name
and flags passed to CONF_modules_load_file().
2. By default we still keep going when configuration file
processing fails. But, applications that want to be strict
about initialization errors can now make explicit flag
choices via non-null OPENSSL_INIT_SETTINGS that omit the
CONF_MFLAGS_IGNORE_RETURN_CODES flag (which had so far been
both undocumented and unused).
3. In OPENSSL_init_ssl() do not request OPENSSL_INIT_LOAD_CONFIG
if the options already include OPENSSL_INIT_NO_LOAD_CONFIG.
4. Don't set up atexit() handlers when called with INIT_BASE_ONLY.
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7986)
78 lines
1.9 KiB
C
78 lines
1.9 KiB
C
/*
|
|
* Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <openssl/crypto.h>
|
|
#include "internal/cryptlib.h"
|
|
#include "internal/conf.h"
|
|
#include <openssl/x509.h>
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/engine.h>
|
|
|
|
#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
|
|
* called, unless this is overridden by calling OPENSSL_no_config()
|
|
*/
|
|
|
|
static int openssl_configured = 0;
|
|
|
|
#if !OPENSSL_API_1_1_0
|
|
void OPENSSL_config(const char *appname)
|
|
{
|
|
OPENSSL_INIT_SETTINGS settings;
|
|
|
|
memset(&settings, 0, sizeof(settings));
|
|
if (appname != NULL)
|
|
settings.appname = strdup(appname);
|
|
OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, &settings);
|
|
}
|
|
#endif
|
|
|
|
int openssl_config_int(const OPENSSL_INIT_SETTINGS *settings)
|
|
{
|
|
int ret;
|
|
const char *filename;
|
|
const char *appname;
|
|
unsigned long flags;
|
|
|
|
if (openssl_configured)
|
|
return 1;
|
|
|
|
filename = settings ? settings->filename : NULL;
|
|
appname = settings ? settings->appname : NULL;
|
|
flags = settings ? settings->flags : DEFAULT_CONF_MFLAGS;
|
|
|
|
#ifdef OPENSSL_INIT_DEBUG
|
|
fprintf(stderr, "OPENSSL_INIT: openssl_config_int(%s, %s, %lu)\n",
|
|
filename, appname, flags);
|
|
#endif
|
|
|
|
OPENSSL_load_builtin_modules();
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
/* Need to load ENGINEs */
|
|
ENGINE_load_builtin_engines();
|
|
#endif
|
|
ERR_clear_error();
|
|
#ifndef OPENSSL_SYS_UEFI
|
|
ret = CONF_modules_load_file(filename, appname, flags);
|
|
#endif
|
|
openssl_configured = 1;
|
|
return ret;
|
|
}
|
|
|
|
void openssl_no_config_int(void)
|
|
{
|
|
openssl_configured = 1;
|
|
}
|