summaryrefslogtreecommitdiffstats
path: root/crypto/property/property_local.h
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2021-11-05 13:29:41 +0000
committerMatt Caswell <matt@openssl.org>2021-11-12 17:16:01 +0000
commit6de9214a5062e9d015c84cbbab681184e16fccaa (patch)
tree487bd063e65cdcdcb278f2f84484a82557ed7ccd /crypto/property/property_local.h
parent3641f04fb06e9679a67da113bab65e5f1bb5e9ba (diff)
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)
Diffstat (limited to 'crypto/property/property_local.h')
-rw-r--r--crypto/property/property_local.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/property/property_local.h b/crypto/property/property_local.h
index 46c5dbe3cc..6b85ce1586 100644
--- a/crypto/property/property_local.h
+++ b/crypto/property/property_local.h
@@ -34,7 +34,8 @@ struct ossl_property_list_st {
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 */
OSSL_PROPERTY_IDX ossl_property_name(OSSL_LIB_CTX *ctx, const char *s,