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)
30 lines
805 B
C
30 lines
805 B
C
/*
|
|
* Copyright 2016-2018 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
|
|
*/
|
|
|
|
#ifndef HEADER_INTERNAL_CONF_H
|
|
# define HEADER_INTERNAL_CONF_H
|
|
|
|
#include <openssl/conf.h>
|
|
|
|
#define DEFAULT_CONF_MFLAGS \
|
|
(CONF_MFLAGS_DEFAULT_SECTION | \
|
|
CONF_MFLAGS_IGNORE_MISSING_FILE | \
|
|
CONF_MFLAGS_IGNORE_RETURN_CODES)
|
|
|
|
struct ossl_init_settings_st {
|
|
char *filename;
|
|
char *appname;
|
|
unsigned long flags;
|
|
};
|
|
|
|
int openssl_config_int(const OPENSSL_INIT_SETTINGS *);
|
|
void openssl_no_config_int(void);
|
|
void conf_modules_free_int(void);
|
|
|
|
#endif
|