mirror of
https://github.com/openssl/openssl.git
synced 2024-12-21 06:09:35 +08:00
0981c20f8e
When parsing the stable section of a config such as this: openssl_conf = openssl_init [openssl_init] stbl_section = mstbl [mstbl] id-tc26 = min Can lead to a SIGSEGV, as the parsing code doesnt recognize min as a proper section name without a trailing colon to associate it with a value. As a result the stack of configuration values has an entry with a null value in it, which leads to the SIGSEGV in do_tcreate when we attempt to pass NULL to strtoul. Fix it by skipping any entry in the config name/value list that has a null value, prior to passing it to stroul Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22988)
82 lines
1.8 KiB
C
82 lines
1.8 KiB
C
/*
|
|
* Copyright 2023 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 <openssl/evp.h>
|
|
#include "testutil.h"
|
|
|
|
static char *config_file = NULL;
|
|
|
|
typedef enum OPTION_choice {
|
|
OPT_ERR = -1,
|
|
OPT_EOF = 0,
|
|
OPT_CONFIG_FILE,
|
|
OPT_TEST_ENUM
|
|
} OPTION_CHOICE;
|
|
|
|
const OPTIONS *test_get_options(void)
|
|
{
|
|
static const OPTIONS options[] = {
|
|
OPT_TEST_OPTIONS_DEFAULT_USAGE,
|
|
{ "config", OPT_CONFIG_FILE, '<',
|
|
"The configuration file to use for the libctx" },
|
|
{ NULL }
|
|
};
|
|
return options;
|
|
}
|
|
|
|
|
|
/*
|
|
* Test that parsing a config file with incorrect stable settings aren't parsed
|
|
* and appropriate errors are raised
|
|
*/
|
|
static int test_asn1_stable_parse(void)
|
|
{
|
|
int testret = 0;
|
|
unsigned long errcode;
|
|
OSSL_LIB_CTX *newctx = OSSL_LIB_CTX_new();
|
|
|
|
if (!TEST_ptr(newctx))
|
|
goto out;
|
|
|
|
if (!TEST_int_eq(OSSL_LIB_CTX_load_config(newctx, config_file), 0))
|
|
goto err;
|
|
|
|
errcode = ERR_peek_error();
|
|
if (ERR_GET_LIB(errcode) != ERR_LIB_ASN1)
|
|
goto err;
|
|
if (ERR_GET_REASON(errcode) != ASN1_R_INVALID_STRING_TABLE_VALUE)
|
|
goto err;
|
|
|
|
ERR_clear_error();
|
|
|
|
testret = 1;
|
|
err:
|
|
OSSL_LIB_CTX_free(newctx);
|
|
out:
|
|
return testret;
|
|
}
|
|
|
|
int setup_tests(void)
|
|
{
|
|
OPTION_CHOICE o;
|
|
|
|
while ((o = opt_next()) != OPT_EOF) {
|
|
switch (o) {
|
|
case OPT_CONFIG_FILE:
|
|
config_file = opt_arg();
|
|
break;
|
|
default:
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
ADD_TEST(test_asn1_stable_parse);
|
|
return 1;
|
|
}
|