Skip to content

src: set CONF_MFLAGS_DEFAULT_SECTION for OpenSSL 3 #38732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
danbev wants to merge 3 commits into from
Closed

src: set CONF_MFLAGS_DEFAULT_SECTION for OpenSSL 3 #38732

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86fa07c
src: set CONF_MFLAGS_DEFAULT_SECTION for OpenSSL 3
danbev May 18, 2021
7a8579f
squash! src: set CONF_MFLAGS_DEFAULT_SECTION for OpenSSL 3
danbev May 20, 2021
ae15490
squash! src: set CONF_MFLAGS_DEFAULT_SECTION for OpenSSL 3
danbev May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
squash! src: set CONF_MFLAGS_DEFAULT_SECTION for OpenSSL 3 
Remove setting of config_filename when OPENSSL_CONF environment variable
is specified (only set it for --openssl-config Node.js option.
  • Loading branch information
@danbev
danbev committed May 20, 2021
commit 7a8579f3af96d05cff192fe9bfe95cb797de745e
12 changes: 5 additions & 7 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,15 +1041,13 @@ InitializationResult InitializeOncePerProcess(int argc, char** argv) {
credentials::SafeGetenv("OPENSSL_CONF", &env_openssl_conf);

bool has_cli_conf = !per_process::cli_options->openssl_config.empty();
bool has_env_conf = !env_openssl_conf.empty();

if (has_cli_conf || has_env_conf) {
const char* conf = has_cli_conf ?
per_process::cli_options->openssl_config.c_str() :
env_openssl_conf.c_str();
if (has_cli_conf || !env_openssl_conf.empty()) {
OPENSSL_INIT_SETTINGS* settings = OPENSSL_INIT_new();
OPENSSL_INIT_set_config_filename(settings, conf);
OPENSSL_INIT_set_config_file_flags(settings, CONF_MFLAGS_DEFAULT_SECTION);
if (has_cli_conf) {
const char* conf = per_process::cli_options->openssl_config.c_str();
OPENSSL_INIT_set_config_filename(settings, conf);
}
OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, settings);
Comment thread
danbev marked this conversation as resolved.
Resolved
OPENSSL_INIT_free(settings);

Expand Down