root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Don't write to the globals ossl_property_true and ossl_property_false 

These global variables were previously overwritten with the same value
every time we created a new OSSL_LIB_CTX. Instead we preinitialise them
with the correct values, and then confirm that settings for each
OSSL_LIB_CTX agree with the preinitialised values.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16980)
This commit is contained in:
Matt Caswell 2021-11-05 13:29:41 +00:00
parent 3641f04fb0
commit 6de9214a50
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/property/property_local.h
View File

@ -34,7 +34,8 @@ struct ossl_property_list_st {
OSSL_PROPERTY_DEFINITION properties[1]; OSSL_PROPERTY_DEFINITION properties[1];
}; };
extern OSSL_PROPERTY_IDX ossl_property_true, ossl_property_false; #define OSSL_PROPERTY_TRUE 1
#define OSSL_PROPERTY_FALSE 2
/* Property string functions */ /* Property string functions */
OSSL_PROPERTY_IDX ossl_property_name(OSSL_LIB_CTX *ctx, const char *s, OSSL_PROPERTY_IDX ossl_property_name(OSSL_LIB_CTX *ctx, const char *s,

20
crypto/property/property_parse.c
View File

@ -19,8 +19,6 @@
#include "property_local.h" #include "property_local.h"
#include "e_os.h" #include "e_os.h"
OSSL_PROPERTY_IDX ossl_property_true, ossl_property_false;
DEFINE_STACK_OF(OSSL_PROPERTY_DEFINITION) DEFINE_STACK_OF(OSSL_PROPERTY_DEFINITION)
static const char *skip_space(const char *s) static const char *skip_space(const char *s)
@ -352,7 +350,7 @@ OSSL_PROPERTY_LIST *ossl_parse_property(OSSL_LIB_CTX *ctx, const char *defn)
} else { } else {
/* A name alone means a true Boolean */ /* A name alone means a true Boolean */
prop->type = OSSL_PROPERTY_TYPE_STRING; prop->type = OSSL_PROPERTY_TYPE_STRING;
prop->v.str_val = ossl_property_true; prop->v.str_val = OSSL_PROPERTY_TRUE;
} }
if (!sk_OSSL_PROPERTY_DEFINITION_push(sk, prop)) if (!sk_OSSL_PROPERTY_DEFINITION_push(sk, prop))
@ -411,7 +409,7 @@ OSSL_PROPERTY_LIST *ossl_parse_query(OSSL_LIB_CTX *ctx, const char *s,
/* A name alone is a Boolean comparison for true */ /* A name alone is a Boolean comparison for true */
prop->oper = OSSL_PROPERTY_OPER_EQ; prop->oper = OSSL_PROPERTY_OPER_EQ;
prop->type = OSSL_PROPERTY_TYPE_STRING; prop->type = OSSL_PROPERTY_TYPE_STRING;
prop->v.str_val = ossl_property_true; prop->v.str_val = OSSL_PROPERTY_TRUE;
goto skip_value; goto skip_value;
} }
if (!parse_value(ctx, &s, prop, create_values)) if (!parse_value(ctx, &s, prop, create_values))
@ -485,9 +483,9 @@ int ossl_property_match_count(const OSSL_PROPERTY_LIST *query,
return -1; return -1;
} else if (q[i].type != OSSL_PROPERTY_TYPE_STRING } else if (q[i].type != OSSL_PROPERTY_TYPE_STRING
|| (oper == OSSL_PROPERTY_OPER_EQ || (oper == OSSL_PROPERTY_OPER_EQ
&& q[i].v.str_val != ossl_property_false) && q[i].v.str_val != OSSL_PROPERTY_FALSE)
|| (oper == OSSL_PROPERTY_OPER_NE || (oper == OSSL_PROPERTY_OPER_NE
&& q[i].v.str_val == ossl_property_false)) { && q[i].v.str_val == OSSL_PROPERTY_FALSE)) {
if (!q[i].optional) if (!q[i].optional)
return -1; return -1;
} else { } else {
@ -560,9 +558,13 @@ int ossl_property_parse_init(OSSL_LIB_CTX *ctx)
if (ossl_property_name(ctx, predefined_names[i], 1) == 0) if (ossl_property_name(ctx, predefined_names[i], 1) == 0)
goto err; goto err;
/* Pre-populate the two Boolean values */ /*
if ((ossl_property_true = ossl_property_value(ctx, "yes", 1)) == 0 * Pre-populate the two Boolean values. We must do them before any other
|| (ossl_property_false = ossl_property_value(ctx, "no", 1)) == 0) * values and in this order so that we get the same index as the global
* OSSL_PROPERTY_TRUE and OSSL_PROPERTY_FALSE values
*/
if ((ossl_property_value(ctx, "yes", 1) != OSSL_PROPERTY_TRUE)
|| (ossl_property_value(ctx, "no", 1) != OSSL_PROPERTY_FALSE))
goto err; goto err;
return 1; return 1;

4
crypto/property/property_query.c
View File

@ -75,8 +75,8 @@ int ossl_property_is_enabled(OSSL_LIB_CTX *ctx, const char *property_name,
return 0; return 0;
return (prop->type == OSSL_PROPERTY_TYPE_STRING return (prop->type == OSSL_PROPERTY_TYPE_STRING
&& ((prop->oper == OSSL_PROPERTY_OPER_EQ && ((prop->oper == OSSL_PROPERTY_OPER_EQ
&& prop->v.str_val == ossl_property_true) && prop->v.str_val == OSSL_PROPERTY_TRUE)
|| (prop->oper == OSSL_PROPERTY_OPER_NE || (prop->oper == OSSL_PROPERTY_OPER_NE
&& prop->v.str_val != ossl_property_true))); && prop->v.str_val != OSSL_PROPERTY_TRUE)));
} }