mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
69c067ffbc
Even if some configuration entry is incorrect, do not skip the remaining ones. Fixes #20789 Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/23048)
106 lines
2.9 KiB
C
106 lines
2.9 KiB
C
/*
|
|
* Copyright 2015-2020 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/conf.h>
|
|
#include <openssl/ssl.h>
|
|
#include "ssl_local.h"
|
|
#include "internal/sslconf.h"
|
|
|
|
/* SSL library configuration module. */
|
|
|
|
void SSL_add_ssl_module(void)
|
|
{
|
|
/* Do nothing. This will be added automatically by libcrypto */
|
|
}
|
|
|
|
static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name, int system)
|
|
{
|
|
SSL_CONF_CTX *cctx = NULL;
|
|
size_t i, idx, cmd_count;
|
|
int err = 1;
|
|
unsigned int flags;
|
|
const SSL_METHOD *meth;
|
|
const SSL_CONF_CMD *cmds;
|
|
OSSL_LIB_CTX *prev_libctx = NULL;
|
|
OSSL_LIB_CTX *libctx = NULL;
|
|
|
|
if (s == NULL && ctx == NULL) {
|
|
ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
|
|
goto err;
|
|
}
|
|
|
|
if (name == NULL && system)
|
|
name = "system_default";
|
|
if (!conf_ssl_name_find(name, &idx)) {
|
|
if (!system)
|
|
ERR_raise_data(ERR_LIB_SSL, SSL_R_INVALID_CONFIGURATION_NAME,
|
|
"name=%s", name);
|
|
goto err;
|
|
}
|
|
cmds = conf_ssl_get(idx, &name, &cmd_count);
|
|
cctx = SSL_CONF_CTX_new();
|
|
if (cctx == NULL)
|
|
goto err;
|
|
flags = SSL_CONF_FLAG_FILE;
|
|
if (!system)
|
|
flags |= SSL_CONF_FLAG_CERTIFICATE | SSL_CONF_FLAG_REQUIRE_PRIVATE;
|
|
if (s != NULL) {
|
|
meth = s->method;
|
|
SSL_CONF_CTX_set_ssl(cctx, s);
|
|
libctx = s->ctx->libctx;
|
|
} else {
|
|
meth = ctx->method;
|
|
SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
|
|
libctx = ctx->libctx;
|
|
}
|
|
if (meth->ssl_accept != ssl_undefined_function)
|
|
flags |= SSL_CONF_FLAG_SERVER;
|
|
if (meth->ssl_connect != ssl_undefined_function)
|
|
flags |= SSL_CONF_FLAG_CLIENT;
|
|
SSL_CONF_CTX_set_flags(cctx, flags);
|
|
prev_libctx = OSSL_LIB_CTX_set0_default(libctx);
|
|
err = 0;
|
|
for (i = 0; i < cmd_count; i++) {
|
|
char *cmdstr, *arg;
|
|
int rv;
|
|
|
|
conf_ssl_get_cmd(cmds, i, &cmdstr, &arg);
|
|
rv = SSL_CONF_cmd(cctx, cmdstr, arg);
|
|
if (rv <= 0) {
|
|
int errcode = rv == -2 ? SSL_R_UNKNOWN_COMMAND : SSL_R_BAD_VALUE;
|
|
|
|
ERR_raise_data(ERR_LIB_SSL, errcode,
|
|
"section=%s, cmd=%s, arg=%s", name, cmdstr, arg);
|
|
++err;
|
|
}
|
|
}
|
|
if (!SSL_CONF_CTX_finish(cctx))
|
|
++err;
|
|
err:
|
|
OSSL_LIB_CTX_set0_default(prev_libctx);
|
|
SSL_CONF_CTX_free(cctx);
|
|
return err == 0;
|
|
}
|
|
|
|
int SSL_config(SSL *s, const char *name)
|
|
{
|
|
return ssl_do_config(s, NULL, name, 0);
|
|
}
|
|
|
|
int SSL_CTX_config(SSL_CTX *ctx, const char *name)
|
|
{
|
|
return ssl_do_config(NULL, ctx, name, 0);
|
|
}
|
|
|
|
void ssl_ctx_system_config(SSL_CTX *ctx)
|
|
{
|
|
ssl_do_config(NULL, ctx, NULL, 1);
|
|
}
|