9933d4a06b
Great effort has been made to make initialization more configurable.
However, the behavior of OPENSSL_config() was lost in the process,
having it suddenly generate errors it didn't previously, which is not
how it's documented to behave.
A simple setting of default flags fixes this problem.
Fixes #8528
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8533)
(cherry picked from commit 905c9a72a7)
78 lines
2 KiB
C
78 lines
2 KiB
C
/*
|
|
* Copyright 2002-2019 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (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_COMPAT < 0x10100000L
|
|
void OPENSSL_config(const char *appname)
|
|
{
|
|
OPENSSL_INIT_SETTINGS settings;
|
|
|
|
memset(&settings, 0, sizeof(settings));
|
|
if (appname != NULL)
|
|
settings.appname = strdup(appname);
|
|
settings.flags = DEFAULT_CONF_MFLAGS;
|
|
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;
|
|
}
|