/*
- * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
#include <openssl/lhash.h>
#include "internal/propertyerr.h"
#include "internal/property.h"
-#include "property_lcl.h"
+#include "internal/core.h"
+#include "property_local.h"
+#include "crypto/context.h"
/*
* Implement a property definition cache.
DEFINE_LHASH_OF(PROPERTY_DEFN_ELEM);
-static LHASH_OF(PROPERTY_DEFN_ELEM) *property_defns = NULL;
-
static unsigned long property_defn_hash(const PROPERTY_DEFN_ELEM *a)
{
return OPENSSL_LH_strhash(a->prop);
OPENSSL_free(elem);
}
-int ossl_prop_defn_init(void)
+void ossl_property_defns_free(void *vproperty_defns)
{
- property_defns = lh_PROPERTY_DEFN_ELEM_new(&property_defn_hash,
- &property_defn_cmp);
- return property_defns != NULL;
-}
+ LHASH_OF(PROPERTY_DEFN_ELEM) *property_defns = vproperty_defns;
-void ossl_prop_defn_cleanup(void)
-{
if (property_defns != NULL) {
- lh_PROPERTY_DEFN_ELEM_doall(property_defns, &property_defn_free);
+ lh_PROPERTY_DEFN_ELEM_doall(property_defns,
+ &property_defn_free);
lh_PROPERTY_DEFN_ELEM_free(property_defns);
- property_defns = NULL;
}
}
-OSSL_PROPERTY_LIST *ossl_prop_defn_get(const char *prop)
+void *ossl_property_defns_new(OSSL_LIB_CTX *ctx) {
+ return lh_PROPERTY_DEFN_ELEM_new(&property_defn_hash, &property_defn_cmp);
+}
+
+OSSL_PROPERTY_LIST *ossl_prop_defn_get(OSSL_LIB_CTX *ctx, const char *prop)
{
PROPERTY_DEFN_ELEM elem, *r;
+ LHASH_OF(PROPERTY_DEFN_ELEM) *property_defns;
+
+ property_defns = ossl_lib_ctx_get_data(ctx,
+ OSSL_LIB_CTX_PROPERTY_DEFN_INDEX);
+ if (property_defns == NULL || !ossl_lib_ctx_read_lock(ctx))
+ return NULL;
elem.prop = prop;
r = lh_PROPERTY_DEFN_ELEM_retrieve(property_defns, &elem);
+ ossl_lib_ctx_unlock(ctx);
return r != NULL ? r->defn : NULL;
}
-int ossl_prop_defn_set(const char *prop, OSSL_PROPERTY_LIST *pl)
+/*
+ * Cache the property list for a given property string. Callers of this function
+ * should call ossl_prop_defn_get first to ensure that there is no existing
+ * cache entry for this property string.
+ */
+int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop,
+ OSSL_PROPERTY_LIST *pl)
{
PROPERTY_DEFN_ELEM elem, *old, *p = NULL;
size_t len;
+ LHASH_OF(PROPERTY_DEFN_ELEM) *property_defns;
+ int res = 1;
+
+ property_defns = ossl_lib_ctx_get_data(ctx,
+ OSSL_LIB_CTX_PROPERTY_DEFN_INDEX);
+ if (property_defns == NULL)
+ return 0;
if (prop == NULL)
return 1;
+ if (!ossl_lib_ctx_write_lock(ctx))
+ return 0;
if (pl == NULL) {
elem.prop = prop;
lh_PROPERTY_DEFN_ELEM_delete(property_defns, &elem);
- return 1;
+ goto end;
}
len = strlen(prop);
p = OPENSSL_malloc(sizeof(*p) + len);
p->defn = pl;
memcpy(p->body, prop, len + 1);
old = lh_PROPERTY_DEFN_ELEM_insert(property_defns, p);
- if (old != NULL) {
- property_defn_free(old);
- return 1;
+ if (!ossl_assert(old == NULL)) {
+ /*
+ * This should not happen. Any caller of ossl_prop_defn_set should
+ * have called ossl_prop_defn_get first - so we should know that
+ * there is no existing entry. If we get here we have a bug. We
+ * deliberately leak the |old| reference in order to avoid a crash
+ * if there are any existing users of it.
+ */
+ goto end;
}
if (!lh_PROPERTY_DEFN_ELEM_error(property_defns))
- return 1;
+ goto end;
}
OPENSSL_free(p);
- return 0;
+ res = 0;
+ end:
+ ossl_lib_ctx_unlock(ctx);
+ return res;
}