Latest update.
This commit is contained in:
@@ -348,10 +348,15 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
|
||||
psection = section;
|
||||
}
|
||||
p = eat_ws(conf, end);
|
||||
if (strncmp(pname, ".include", 8) == 0 && p != pname + 8) {
|
||||
if (strncmp(pname, ".include", 8) == 0
|
||||
&& (p != pname + 8 || *p == '=')) {
|
||||
char *include = NULL;
|
||||
BIO *next;
|
||||
|
||||
if (*p == '=') {
|
||||
p++;
|
||||
p = eat_ws(conf, p);
|
||||
}
|
||||
trim_ws(conf, p);
|
||||
if (!str_copy(conf, psection, &include, p))
|
||||
goto err;
|
||||
|
||||
@@ -78,6 +78,8 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
|
||||
cnt = sk_CONF_VALUE_num(cmd_lists);
|
||||
ssl_module_free(md);
|
||||
ssl_names = OPENSSL_zalloc(sizeof(*ssl_names) * cnt);
|
||||
if (ssl_names == NULL)
|
||||
goto err;
|
||||
ssl_names_count = cnt;
|
||||
for (i = 0; i < ssl_names_count; i++) {
|
||||
struct ssl_conf_name_st *ssl_name = ssl_names + i;
|
||||
|
||||
@@ -181,7 +181,7 @@ static const unsigned int c1_923 = 0x07b126; /* scale * 1.923 */
|
||||
static const unsigned int c4_690 = 0x12c28f; /* scale * 4.690 */
|
||||
|
||||
/*
|
||||
* Multiply two scale integers together and rescale the result.
|
||||
* Multiply two scaled integers together and rescale the result.
|
||||
*/
|
||||
static ossl_inline uint64_t mul2(uint64_t a, uint64_t b)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user