/*
- * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
#include <openssl/err.h>
#include "internal/provider.h"
#include "internal/refcount.h"
+#include "internal/core.h"
#include "crypto/evp.h"
#include "evp_local.h"
-
static void *keymgmt_new(void)
{
EVP_KEYMGMT *keymgmt = NULL;
- if ((keymgmt = OPENSSL_zalloc(sizeof(*keymgmt))) == NULL
- || (keymgmt->lock = CRYPTO_THREAD_lock_new()) == NULL) {
+ if ((keymgmt = OPENSSL_zalloc(sizeof(*keymgmt))) == NULL)
+ return NULL;
+ if (!CRYPTO_NEW_REF(&keymgmt->refcnt, 1)) {
EVP_KEYMGMT_free(keymgmt);
- EVPerr(0, ERR_R_MALLOC_FAILURE);
return NULL;
}
+ return keymgmt;
+}
- keymgmt->refcnt = 1;
+#ifndef FIPS_MODULE
+static void help_get_legacy_alg_type_from_keymgmt(const char *keytype,
+ void *arg)
+{
+ int *type = arg;
- return keymgmt;
+ if (*type == NID_undef)
+ *type = evp_pkey_name2type(keytype);
}
-static void *keymgmt_from_dispatch(int name_id,
- const OSSL_DISPATCH *fns,
- OSSL_PROVIDER *prov)
+static int get_legacy_alg_type_from_keymgmt(const EVP_KEYMGMT *keymgmt)
{
+ int type = NID_undef;
+
+ EVP_KEYMGMT_names_do_all(keymgmt, help_get_legacy_alg_type_from_keymgmt,
+ &type);
+ return type;
+}
+#endif
+
+static void *keymgmt_from_algorithm(int name_id,
+ const OSSL_ALGORITHM *algodef,
+ OSSL_PROVIDER *prov)
+{
+ const OSSL_DISPATCH *fns = algodef->implementation;
EVP_KEYMGMT *keymgmt = NULL;
int setparamfncnt = 0, getparamfncnt = 0;
int setgenparamfncnt = 0;
int importfncnt = 0, exportfncnt = 0;
+ int importtypesfncnt = 0, exporttypesfncnt = 0;
+
+ if ((keymgmt = keymgmt_new()) == NULL)
+ return NULL;
- if ((keymgmt = keymgmt_new()) == NULL) {
+ keymgmt->name_id = name_id;
+ if ((keymgmt->type_name = ossl_algorithm_get1_first_name(algodef)) == NULL) {
EVP_KEYMGMT_free(keymgmt);
return NULL;
}
- keymgmt->name_id = name_id;
+ keymgmt->description = algodef->algorithm_description;
for (; fns->function_id != 0; fns++) {
switch (fns->function_id) {
if (keymgmt->free == NULL)
keymgmt->free = OSSL_FUNC_keymgmt_free(fns);
break;
+ case OSSL_FUNC_KEYMGMT_LOAD:
+ if (keymgmt->load == NULL)
+ keymgmt->load = OSSL_FUNC_keymgmt_load(fns);
+ break;
case OSSL_FUNC_KEYMGMT_GET_PARAMS:
if (keymgmt->get_params == NULL) {
getparamfncnt++;
if (keymgmt->has == NULL)
keymgmt->has = OSSL_FUNC_keymgmt_has(fns);
break;
- case OSSL_FUNC_KEYMGMT_COPY:
- if (keymgmt->copy == NULL)
- keymgmt->copy = OSSL_FUNC_keymgmt_copy(fns);
+ case OSSL_FUNC_KEYMGMT_DUP:
+ if (keymgmt->dup == NULL)
+ keymgmt->dup = OSSL_FUNC_keymgmt_dup(fns);
break;
case OSSL_FUNC_KEYMGMT_VALIDATE:
if (keymgmt->validate == NULL)
break;
case OSSL_FUNC_KEYMGMT_IMPORT_TYPES:
if (keymgmt->import_types == NULL) {
- importfncnt++;
+ if (importtypesfncnt == 0)
+ importfncnt++;
+ importtypesfncnt++;
keymgmt->import_types = OSSL_FUNC_keymgmt_import_types(fns);
}
break;
+ case OSSL_FUNC_KEYMGMT_IMPORT_TYPES_EX:
+ if (keymgmt->import_types_ex == NULL) {
+ if (importtypesfncnt == 0)
+ importfncnt++;
+ importtypesfncnt++;
+ keymgmt->import_types_ex = OSSL_FUNC_keymgmt_import_types_ex(fns);
+ }
+ break;
case OSSL_FUNC_KEYMGMT_EXPORT:
if (keymgmt->export == NULL) {
exportfncnt++;
break;
case OSSL_FUNC_KEYMGMT_EXPORT_TYPES:
if (keymgmt->export_types == NULL) {
- exportfncnt++;
+ if (exporttypesfncnt == 0)
+ exportfncnt++;
+ exporttypesfncnt++;
keymgmt->export_types = OSSL_FUNC_keymgmt_export_types(fns);
}
break;
+ case OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX:
+ if (keymgmt->export_types_ex == NULL) {
+ if (exporttypesfncnt == 0)
+ exportfncnt++;
+ exporttypesfncnt++;
+ keymgmt->export_types_ex = OSSL_FUNC_keymgmt_export_types_ex(fns);
+ }
+ break;
}
}
/*
* export if you can't import or export.
*/
if (keymgmt->free == NULL
- || (keymgmt->new == NULL && keymgmt->gen == NULL)
+ || (keymgmt->new == NULL
+ && keymgmt->gen == NULL
+ && keymgmt->load == NULL)
|| keymgmt->has == NULL
|| (getparamfncnt != 0 && getparamfncnt != 2)
|| (setparamfncnt != 0 && setparamfncnt != 2)
&& (keymgmt->gen_init == NULL
|| keymgmt->gen_cleanup == NULL))) {
EVP_KEYMGMT_free(keymgmt);
- EVPerr(0, EVP_R_INVALID_PROVIDER_FUNCTIONS);
+ ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS);
return NULL;
}
keymgmt->prov = prov;
if (prov != NULL)
ossl_provider_up_ref(prov);
+#ifndef FIPS_MODULE
+ keymgmt->legacy_alg = get_legacy_alg_type_from_keymgmt(keymgmt);
+#endif
+
return keymgmt;
}
-EVP_KEYMGMT *evp_keymgmt_fetch_by_number(OPENSSL_CTX *ctx, int name_id,
+EVP_KEYMGMT *evp_keymgmt_fetch_from_prov(OSSL_PROVIDER *prov,
+ const char *name,
const char *properties)
{
- return evp_generic_fetch_by_number(ctx,
- OSSL_OP_KEYMGMT, name_id, properties,
- keymgmt_from_dispatch,
+ return evp_generic_fetch_from_prov(prov, OSSL_OP_KEYMGMT,
+ name, properties,
+ keymgmt_from_algorithm,
(int (*)(void *))EVP_KEYMGMT_up_ref,
(void (*)(void *))EVP_KEYMGMT_free);
}
-EVP_KEYMGMT *EVP_KEYMGMT_fetch(OPENSSL_CTX *ctx, const char *algorithm,
+EVP_KEYMGMT *EVP_KEYMGMT_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties)
{
return evp_generic_fetch(ctx, OSSL_OP_KEYMGMT, algorithm, properties,
- keymgmt_from_dispatch,
+ keymgmt_from_algorithm,
(int (*)(void *))EVP_KEYMGMT_up_ref,
(void (*)(void *))EVP_KEYMGMT_free);
}
{
int ref = 0;
- CRYPTO_UP_REF(&keymgmt->refcnt, &ref, keymgmt->lock);
+ CRYPTO_UP_REF(&keymgmt->refcnt, &ref);
return 1;
}
if (keymgmt == NULL)
return;
- CRYPTO_DOWN_REF(&keymgmt->refcnt, &ref, keymgmt->lock);
+ CRYPTO_DOWN_REF(&keymgmt->refcnt, &ref);
if (ref > 0)
return;
+ OPENSSL_free(keymgmt->type_name);
ossl_provider_free(keymgmt->prov);
- CRYPTO_THREAD_lock_free(keymgmt->lock);
+ CRYPTO_FREE_REF(&keymgmt->refcnt);
OPENSSL_free(keymgmt);
}
-const OSSL_PROVIDER *EVP_KEYMGMT_provider(const EVP_KEYMGMT *keymgmt)
+const OSSL_PROVIDER *EVP_KEYMGMT_get0_provider(const EVP_KEYMGMT *keymgmt)
{
return keymgmt->prov;
}
-int EVP_KEYMGMT_number(const EVP_KEYMGMT *keymgmt)
+int evp_keymgmt_get_number(const EVP_KEYMGMT *keymgmt)
{
return keymgmt->name_id;
}
+int evp_keymgmt_get_legacy_alg(const EVP_KEYMGMT *keymgmt)
+{
+ return keymgmt->legacy_alg;
+}
+
+const char *EVP_KEYMGMT_get0_description(const EVP_KEYMGMT *keymgmt)
+{
+ return keymgmt->description;
+}
+
+const char *EVP_KEYMGMT_get0_name(const EVP_KEYMGMT *keymgmt)
+{
+ return keymgmt->type_name;
+}
+
int EVP_KEYMGMT_is_a(const EVP_KEYMGMT *keymgmt, const char *name)
{
- return evp_is_a(keymgmt->prov, keymgmt->name_id, NULL, name);
+ return keymgmt != NULL
+ && evp_is_a(keymgmt->prov, keymgmt->name_id, NULL, name);
}
-void EVP_KEYMGMT_do_all_provided(OPENSSL_CTX *libctx,
+void EVP_KEYMGMT_do_all_provided(OSSL_LIB_CTX *libctx,
void (*fn)(EVP_KEYMGMT *keymgmt, void *arg),
void *arg)
{
evp_generic_do_all(libctx, OSSL_OP_KEYMGMT,
(void (*)(void *, void *))fn, arg,
- keymgmt_from_dispatch,
+ keymgmt_from_algorithm,
+ (int (*)(void *))EVP_KEYMGMT_up_ref,
(void (*)(void *))EVP_KEYMGMT_free);
}
-void EVP_KEYMGMT_names_do_all(const EVP_KEYMGMT *keymgmt,
- void (*fn)(const char *name, void *data),
- void *data)
+int EVP_KEYMGMT_names_do_all(const EVP_KEYMGMT *keymgmt,
+ void (*fn)(const char *name, void *data),
+ void *data)
{
if (keymgmt->prov != NULL)
- evp_names_do_all(keymgmt->prov, keymgmt->name_id, fn, data);
+ return evp_names_do_all(keymgmt->prov, keymgmt->name_id, fn, data);
+
+ return 1;
}
/*
*/
void *evp_keymgmt_newdata(const EVP_KEYMGMT *keymgmt)
{
- void *provctx = ossl_provider_ctx(EVP_KEYMGMT_provider(keymgmt));
+ void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
/*
- * TODO(3.0) 'new' is currently mandatory on its own, but when new
- * constructors appear, it won't be quite as mandatory, so we have
- * a check for future cases.
+ * 'new' is currently mandatory on its own, but when new
+ * constructors appear, it won't be quite as mandatory,
+ * so we have a check for future cases.
*/
if (keymgmt->new == NULL)
return NULL;
keymgmt->free(keydata);
}
-void *evp_keymgmt_gen_init(const EVP_KEYMGMT *keymgmt, int selection)
+void *evp_keymgmt_gen_init(const EVP_KEYMGMT *keymgmt, int selection,
+ const OSSL_PARAM params[])
{
- void *provctx = ossl_provider_ctx(EVP_KEYMGMT_provider(keymgmt));
+ void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
if (keymgmt->gen_init == NULL)
return NULL;
- return keymgmt->gen_init(provctx, selection);
+ return keymgmt->gen_init(provctx, selection, params);
}
int evp_keymgmt_gen_set_template(const EVP_KEYMGMT *keymgmt, void *genctx,
- void *template)
+ void *templ)
{
/*
* It's arguable if we actually should return success in this case, as
* it allows the caller to set a template key, which is then ignored.
* However, this is how the legacy methods (EVP_PKEY_METHOD) operate,
* so we do this in the interest of backward compatibility.
- * TODO(3.0) Investigate if we should change this behaviour.
*/
if (keymgmt->gen_set_template == NULL)
return 1;
- return keymgmt->gen_set_template(genctx, template);
+ return keymgmt->gen_set_template(genctx, templ);
}
int evp_keymgmt_gen_set_params(const EVP_KEYMGMT *keymgmt, void *genctx,
return keymgmt->gen_set_params(genctx, params);
}
-const OSSL_PARAM *evp_keymgmt_gen_settable_params(const EVP_KEYMGMT *keymgmt)
+const OSSL_PARAM *EVP_KEYMGMT_gen_settable_params(const EVP_KEYMGMT *keymgmt)
{
- void *provctx = ossl_provider_ctx(EVP_KEYMGMT_provider(keymgmt));
+ void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
if (keymgmt->gen_settable_params == NULL)
return NULL;
- return keymgmt->gen_settable_params(provctx);
+ return keymgmt->gen_settable_params(NULL, provctx);
}
void *evp_keymgmt_gen(const EVP_KEYMGMT *keymgmt, void *genctx,
void evp_keymgmt_gen_cleanup(const EVP_KEYMGMT *keymgmt, void *genctx)
{
- if (keymgmt->gen != NULL)
+ if (keymgmt->gen_cleanup != NULL)
keymgmt->gen_cleanup(genctx);
}
+int evp_keymgmt_has_load(const EVP_KEYMGMT *keymgmt)
+{
+ return keymgmt != NULL && keymgmt->load != NULL;
+}
+
+void *evp_keymgmt_load(const EVP_KEYMGMT *keymgmt,
+ const void *objref, size_t objref_sz)
+{
+ if (evp_keymgmt_has_load(keymgmt))
+ return keymgmt->load(objref, objref_sz);
+ return NULL;
+}
+
int evp_keymgmt_get_params(const EVP_KEYMGMT *keymgmt, void *keydata,
OSSL_PARAM params[])
{
return keymgmt->get_params(keydata, params);
}
-const OSSL_PARAM *evp_keymgmt_gettable_params(const EVP_KEYMGMT *keymgmt)
+const OSSL_PARAM *EVP_KEYMGMT_gettable_params(const EVP_KEYMGMT *keymgmt)
{
+ void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
+
if (keymgmt->gettable_params == NULL)
return NULL;
- return keymgmt->gettable_params();
+ return keymgmt->gettable_params(provctx);
}
int evp_keymgmt_set_params(const EVP_KEYMGMT *keymgmt, void *keydata,
return keymgmt->set_params(keydata, params);
}
-const OSSL_PARAM *evp_keymgmt_settable_params(const EVP_KEYMGMT *keymgmt)
+const OSSL_PARAM *EVP_KEYMGMT_settable_params(const EVP_KEYMGMT *keymgmt)
{
+ void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
+
if (keymgmt->settable_params == NULL)
return NULL;
- return keymgmt->settable_params();
+ return keymgmt->settable_params(provctx);
}
int evp_keymgmt_has(const EVP_KEYMGMT *keymgmt, void *keydata, int selection)
}
int evp_keymgmt_validate(const EVP_KEYMGMT *keymgmt, void *keydata,
- int selection)
+ int selection, int checktype)
{
/* We assume valid if the implementation doesn't have a function */
if (keymgmt->validate == NULL)
return 1;
- return keymgmt->validate(keydata, selection);
+ return keymgmt->validate(keydata, selection, checktype);
}
int evp_keymgmt_match(const EVP_KEYMGMT *keymgmt,
const OSSL_PARAM *evp_keymgmt_import_types(const EVP_KEYMGMT *keymgmt,
int selection)
{
+ void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
+
+ if (keymgmt->import_types_ex != NULL)
+ return keymgmt->import_types_ex(provctx, selection);
if (keymgmt->import_types == NULL)
return NULL;
return keymgmt->import_types(selection);
const OSSL_PARAM *evp_keymgmt_export_types(const EVP_KEYMGMT *keymgmt,
int selection)
{
+ void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
+
+ if (keymgmt->export_types_ex != NULL)
+ return keymgmt->export_types_ex(provctx, selection);
if (keymgmt->export_types == NULL)
return NULL;
return keymgmt->export_types(selection);
}
-int evp_keymgmt_copy(const EVP_KEYMGMT *keymgmt,
- void *keydata_to, const void *keydata_from,
- int selection)
+void *evp_keymgmt_dup(const EVP_KEYMGMT *keymgmt, const void *keydata_from,
+ int selection)
{
- /* We assume no copy if the implementation doesn't have a function */
- if (keymgmt->copy == NULL)
- return 0;
- return keymgmt->copy(keydata_to, keydata_from, selection);
+ /* We assume no dup if the implementation doesn't have a function */
+ if (keymgmt->dup == NULL)
+ return NULL;
+ return keymgmt->dup(keydata_from, selection);
}
projects / thirdparty / openssl.git / blobdiff