struct method_data_st {
OPENSSL_CTX *libctx;
const char *name;
- int nid;
OSSL_METHOD_CONSTRUCT_METHOD *mcm;
- void *(*method_from_dispatch)(int nid, const OSSL_DISPATCH *,
+ void *(*method_from_dispatch)(const char *, const OSSL_DISPATCH *,
OSSL_PROVIDER *);
int (*refcnt_up_method)(void *method);
void (*destruct_method)(void *method);
- int (*nid_method)(void *method);
};
/*
&default_method_store_method);
}
+/*
+ * To identity the method in the method store, we mix the name identity
+ * with the operation identity, with the assumption that we don't have
+ * more than 2^24 names or more than 2^8 operation types.
+ *
+ * The resulting identity is a 32-bit integer, composed like this:
+ *
+ * +---------24 bits--------+-8 bits-+
+ * | name identity | op id |
+ * +------------------------+--------+
+ */
+static uint32_t method_id(unsigned int operation_id, unsigned int name_id)
+{
+ if (!ossl_assert(name_id < (1 << 24) || operation_id < (1 << 8))
+ || !ossl_assert(name_id > 0 && operation_id > 0))
+ return 0;
+ return ((name_id << 8) & 0xFFFFFF00) | (operation_id & 0x000000FF);
+}
+
static void *get_method_from_store(OPENSSL_CTX *libctx, void *store,
- const char *name, const char *propquery,
- void *data)
+ int operation_id, const char *name,
+ const char *propquery, void *data)
{
struct method_data_st *methdata = data;
void *method = NULL;
OSSL_NAMEMAP *namemap;
- int id;
+ int nameid;
+ uint32_t methid;
if (store == NULL
&& (store = get_default_method_store(libctx)) == NULL)
return NULL;
if ((namemap = ossl_namemap_stored(libctx)) == NULL
- || (id = ossl_namemap_add(namemap, name)) == 0)
+ || (nameid = ossl_namemap_name2num(namemap, name)) == 0
+ || (methid = method_id(operation_id, nameid)) == 0)
return NULL;
- (void)ossl_method_store_fetch(store, id, propquery, &method);
+ (void)ossl_method_store_fetch(store, methid, propquery, &method);
if (method != NULL
&& !methdata->refcnt_up_method(method)) {
}
static int put_method_in_store(OPENSSL_CTX *libctx, void *store,
- void *method, const char *name,
- const char *propdef, void *data)
+ void *method, int operation_id,
+ const char *name, const char *propdef,
+ void *data)
{
struct method_data_st *methdata = data;
OSSL_NAMEMAP *namemap;
- int id;
+ int nameid;
+ uint32_t methid;
if ((namemap = ossl_namemap_stored(methdata->libctx)) == NULL
- || (id = ossl_namemap_add(namemap, name)) == 0)
+ || (nameid = ossl_namemap_add(namemap, 0, name)) == 0
+ || (methid = method_id(operation_id, nameid)) == 0)
return 0;
if (store == NULL
return 0;
if (methdata->refcnt_up_method(method)
- && ossl_method_store_add(store, id, propdef, method,
+ && ossl_method_store_add(store, methid, propdef, method,
methdata->destruct_method))
return 1;
return 0;
OSSL_PROVIDER *prov, void *data)
{
struct method_data_st *methdata = data;
- /* TODO(3.0) get rid of the need for legacy NIDs */
- int legacy_nid = OBJ_sn2nid(name);
- return methdata->method_from_dispatch(legacy_nid, fns, prov);
+ return methdata->method_from_dispatch(name, fns, prov);
}
static void destruct_method(void *method, void *data)
void *evp_generic_fetch(OPENSSL_CTX *libctx, int operation_id,
const char *name, const char *properties,
- void *(*new_method)(int nid, const OSSL_DISPATCH *fns,
+ void *(*new_method)(const char *name,
+ const OSSL_DISPATCH *fns,
OSSL_PROVIDER *prov),
- int (*upref_method)(void *),
- void (*free_method)(void *),
- int (*nid_method)(void *))
+ int (*up_ref_method)(void *),
+ void (*free_method)(void *))
{
OSSL_METHOD_STORE *store = get_default_method_store(libctx);
OSSL_NAMEMAP *namemap = ossl_namemap_stored(libctx);
- int id;
+ int nameid = 0;
+ uint32_t methid = 0;
void *method = NULL;
if (store == NULL || namemap == NULL)
return NULL;
- if ((id = ossl_namemap_number(namemap, name)) == 0
- || !ossl_method_store_cache_get(store, id, properties, &method)) {
+ /*
+ * If there's ever an operation_id == 0 passed, we have an internal
+ * programming error.
+ */
+ if (!ossl_assert(operation_id > 0))
+ return NULL;
+
+ /*
+ * method_id returns 0 if we have too many operations (more than
+ * about 2^8) or too many names (more than about 2^24). In that
+ * case, we can't create any new method.
+ */
+ if ((nameid = ossl_namemap_name2num(namemap, name)) != 0
+ && (methid = method_id(operation_id, nameid)) == 0)
+ return NULL;
+
+ if (nameid == 0
+ || !ossl_method_store_cache_get(store, methid, properties,
+ &method)) {
OSSL_METHOD_CONSTRUCT_METHOD mcm = {
alloc_tmp_method_store,
dealloc_tmp_method_store,
mcmdata.mcm = &mcm;
mcmdata.libctx = libctx;
+ mcmdata.name = name;
mcmdata.method_from_dispatch = new_method;
mcmdata.destruct_method = free_method;
- mcmdata.refcnt_up_method = upref_method;
+ mcmdata.refcnt_up_method = up_ref_method;
mcmdata.destruct_method = free_method;
- mcmdata.nid_method = nid_method;
- method = ossl_method_construct(libctx, operation_id, name,
- properties, 0 /* !force_cache */,
- &mcm, &mcmdata);
- ossl_method_store_cache_set(store, id, properties, method);
+ if ((method = ossl_method_construct(libctx, operation_id, name,
+ properties, 0 /* !force_cache */,
+ &mcm, &mcmdata)) != NULL) {
+ /*
+ * If construction did create a method for us, we know that
+ * there is a correct nameid and methodid, since those have
+ * already been calculated in get_method_from_store() and
+ * put_method_in_store() above.
+ */
+ nameid = ossl_namemap_name2num(namemap, name);
+ methid = method_id(operation_id, nameid);
+ ossl_method_store_cache_set(store, methid, properties, method);
+ }
} else {
- upref_method(method);
+ up_ref_method(method);
}
return method;
projects / openssl.git / blobdiff