2020-01-12 09:32:12 +08:00
|
|
|
/*
|
2021-03-11 21:27:36 +08:00
|
|
|
* Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
|
2020-01-12 09:32:12 +08:00
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* in the file LICENSE in the source distribution or at
|
|
|
|
* https://www.openssl.org/source/license.html
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <openssl/objects.h>
|
|
|
|
#include <openssl/evp.h>
|
2021-05-18 03:38:51 +08:00
|
|
|
#include "internal/numbers.h" /* includes SIZE_MAX */
|
2020-01-12 09:32:12 +08:00
|
|
|
#include "internal/cryptlib.h"
|
|
|
|
#include "internal/provider.h"
|
2021-04-16 22:22:03 +08:00
|
|
|
#include "internal/core.h"
|
|
|
|
#include "crypto/evp.h"
|
2020-01-12 09:32:12 +08:00
|
|
|
#include "evp_local.h"
|
|
|
|
|
|
|
|
static EVP_SIGNATURE *evp_signature_new(OSSL_PROVIDER *prov)
|
|
|
|
{
|
|
|
|
EVP_SIGNATURE *signature = OPENSSL_zalloc(sizeof(EVP_SIGNATURE));
|
|
|
|
|
2022-09-29 19:57:34 +08:00
|
|
|
if (signature == NULL)
|
2020-01-12 09:32:12 +08:00
|
|
|
return NULL;
|
|
|
|
|
2023-06-22 07:48:49 +08:00
|
|
|
if (!CRYPTO_NEW_REF(&signature->refcnt, 1)) {
|
2020-01-12 09:32:12 +08:00
|
|
|
OPENSSL_free(signature);
|
|
|
|
return NULL;
|
|
|
|
}
|
2023-06-22 07:48:49 +08:00
|
|
|
|
2020-01-12 09:32:12 +08:00
|
|
|
signature->prov = prov;
|
|
|
|
ossl_provider_up_ref(prov);
|
|
|
|
|
|
|
|
return signature;
|
|
|
|
}
|
|
|
|
|
2021-03-16 21:14:43 +08:00
|
|
|
static void *evp_signature_from_algorithm(int name_id,
|
|
|
|
const OSSL_ALGORITHM *algodef,
|
|
|
|
OSSL_PROVIDER *prov)
|
2020-01-12 09:32:12 +08:00
|
|
|
{
|
2021-03-16 21:14:43 +08:00
|
|
|
const OSSL_DISPATCH *fns = algodef->implementation;
|
2020-01-12 09:32:12 +08:00
|
|
|
EVP_SIGNATURE *signature = NULL;
|
|
|
|
int ctxfncnt = 0, signfncnt = 0, verifyfncnt = 0, verifyrecfncnt = 0;
|
|
|
|
int digsignfncnt = 0, digverifyfncnt = 0;
|
|
|
|
int gparamfncnt = 0, sparamfncnt = 0, gmdparamfncnt = 0, smdparamfncnt = 0;
|
|
|
|
|
|
|
|
if ((signature = evp_signature_new(prov)) == NULL) {
|
2022-09-29 19:57:34 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, ERR_R_EVP_LIB);
|
2020-01-12 09:32:12 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
signature->name_id = name_id;
|
2021-04-16 22:22:03 +08:00
|
|
|
if ((signature->type_name = ossl_algorithm_get1_first_name(algodef)) == NULL)
|
|
|
|
goto err;
|
2021-03-16 21:14:43 +08:00
|
|
|
signature->description = algodef->algorithm_description;
|
2020-01-12 09:32:12 +08:00
|
|
|
|
|
|
|
for (; fns->function_id != 0; fns++) {
|
|
|
|
switch (fns->function_id) {
|
|
|
|
case OSSL_FUNC_SIGNATURE_NEWCTX:
|
|
|
|
if (signature->newctx != NULL)
|
|
|
|
break;
|
2020-06-21 07:19:16 +08:00
|
|
|
signature->newctx = OSSL_FUNC_signature_newctx(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
ctxfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_SIGN_INIT:
|
|
|
|
if (signature->sign_init != NULL)
|
|
|
|
break;
|
2020-06-21 07:19:16 +08:00
|
|
|
signature->sign_init = OSSL_FUNC_signature_sign_init(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
signfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_SIGN:
|
|
|
|
if (signature->sign != NULL)
|
|
|
|
break;
|
2020-06-21 07:19:16 +08:00
|
|
|
signature->sign = OSSL_FUNC_signature_sign(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
signfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_VERIFY_INIT:
|
|
|
|
if (signature->verify_init != NULL)
|
|
|
|
break;
|
2020-06-21 07:19:16 +08:00
|
|
|
signature->verify_init = OSSL_FUNC_signature_verify_init(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
verifyfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_VERIFY:
|
|
|
|
if (signature->verify != NULL)
|
|
|
|
break;
|
2020-06-21 07:19:16 +08:00
|
|
|
signature->verify = OSSL_FUNC_signature_verify(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
verifyfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_VERIFY_RECOVER_INIT:
|
|
|
|
if (signature->verify_recover_init != NULL)
|
|
|
|
break;
|
|
|
|
signature->verify_recover_init
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_verify_recover_init(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
verifyrecfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_VERIFY_RECOVER:
|
|
|
|
if (signature->verify_recover != NULL)
|
|
|
|
break;
|
|
|
|
signature->verify_recover
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_verify_recover(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
verifyrecfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT:
|
|
|
|
if (signature->digest_sign_init != NULL)
|
|
|
|
break;
|
|
|
|
signature->digest_sign_init
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_digest_sign_init(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_DIGEST_SIGN_UPDATE:
|
|
|
|
if (signature->digest_sign_update != NULL)
|
|
|
|
break;
|
|
|
|
signature->digest_sign_update
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_digest_sign_update(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
digsignfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_DIGEST_SIGN_FINAL:
|
|
|
|
if (signature->digest_sign_final != NULL)
|
|
|
|
break;
|
|
|
|
signature->digest_sign_final
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_digest_sign_final(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
digsignfncnt++;
|
|
|
|
break;
|
2020-03-05 23:40:48 +08:00
|
|
|
case OSSL_FUNC_SIGNATURE_DIGEST_SIGN:
|
|
|
|
if (signature->digest_sign != NULL)
|
|
|
|
break;
|
|
|
|
signature->digest_sign
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_digest_sign(fns);
|
2020-03-05 23:40:48 +08:00
|
|
|
break;
|
2020-01-12 09:32:12 +08:00
|
|
|
case OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT:
|
|
|
|
if (signature->digest_verify_init != NULL)
|
|
|
|
break;
|
|
|
|
signature->digest_verify_init
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_digest_verify_init(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_UPDATE:
|
|
|
|
if (signature->digest_verify_update != NULL)
|
|
|
|
break;
|
|
|
|
signature->digest_verify_update
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_digest_verify_update(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
digverifyfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_FINAL:
|
|
|
|
if (signature->digest_verify_final != NULL)
|
|
|
|
break;
|
|
|
|
signature->digest_verify_final
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_digest_verify_final(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
digverifyfncnt++;
|
|
|
|
break;
|
2020-03-05 23:40:48 +08:00
|
|
|
case OSSL_FUNC_SIGNATURE_DIGEST_VERIFY:
|
|
|
|
if (signature->digest_verify != NULL)
|
|
|
|
break;
|
|
|
|
signature->digest_verify
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_digest_verify(fns);
|
2020-03-05 23:40:48 +08:00
|
|
|
break;
|
2020-01-12 09:32:12 +08:00
|
|
|
case OSSL_FUNC_SIGNATURE_FREECTX:
|
|
|
|
if (signature->freectx != NULL)
|
|
|
|
break;
|
2020-06-21 07:19:16 +08:00
|
|
|
signature->freectx = OSSL_FUNC_signature_freectx(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
ctxfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_DUPCTX:
|
|
|
|
if (signature->dupctx != NULL)
|
|
|
|
break;
|
2020-06-21 07:19:16 +08:00
|
|
|
signature->dupctx = OSSL_FUNC_signature_dupctx(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS:
|
|
|
|
if (signature->get_ctx_params != NULL)
|
|
|
|
break;
|
|
|
|
signature->get_ctx_params
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_get_ctx_params(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
gparamfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS:
|
|
|
|
if (signature->gettable_ctx_params != NULL)
|
|
|
|
break;
|
|
|
|
signature->gettable_ctx_params
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_gettable_ctx_params(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
gparamfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS:
|
|
|
|
if (signature->set_ctx_params != NULL)
|
|
|
|
break;
|
|
|
|
signature->set_ctx_params
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_set_ctx_params(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
sparamfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS:
|
|
|
|
if (signature->settable_ctx_params != NULL)
|
|
|
|
break;
|
|
|
|
signature->settable_ctx_params
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_settable_ctx_params(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
sparamfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_GET_CTX_MD_PARAMS:
|
|
|
|
if (signature->get_ctx_md_params != NULL)
|
|
|
|
break;
|
|
|
|
signature->get_ctx_md_params
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_get_ctx_md_params(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
gmdparamfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_GETTABLE_CTX_MD_PARAMS:
|
|
|
|
if (signature->gettable_ctx_md_params != NULL)
|
|
|
|
break;
|
|
|
|
signature->gettable_ctx_md_params
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_gettable_ctx_md_params(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
gmdparamfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_SET_CTX_MD_PARAMS:
|
|
|
|
if (signature->set_ctx_md_params != NULL)
|
|
|
|
break;
|
|
|
|
signature->set_ctx_md_params
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_set_ctx_md_params(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
smdparamfncnt++;
|
|
|
|
break;
|
|
|
|
case OSSL_FUNC_SIGNATURE_SETTABLE_CTX_MD_PARAMS:
|
|
|
|
if (signature->settable_ctx_md_params != NULL)
|
|
|
|
break;
|
|
|
|
signature->settable_ctx_md_params
|
2020-06-21 07:19:16 +08:00
|
|
|
= OSSL_FUNC_signature_settable_ctx_md_params(fns);
|
2020-01-12 09:32:12 +08:00
|
|
|
smdparamfncnt++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (ctxfncnt != 2
|
|
|
|
|| (signfncnt == 0
|
|
|
|
&& verifyfncnt == 0
|
|
|
|
&& verifyrecfncnt == 0
|
|
|
|
&& digsignfncnt == 0
|
2020-03-05 23:40:48 +08:00
|
|
|
&& digverifyfncnt == 0
|
|
|
|
&& signature->digest_sign == NULL
|
|
|
|
&& signature->digest_verify == NULL)
|
2020-01-12 09:32:12 +08:00
|
|
|
|| (signfncnt != 0 && signfncnt != 2)
|
|
|
|
|| (verifyfncnt != 0 && verifyfncnt != 2)
|
|
|
|
|| (verifyrecfncnt != 0 && verifyrecfncnt != 2)
|
2020-03-05 23:40:48 +08:00
|
|
|
|| (digsignfncnt != 0 && digsignfncnt != 2)
|
|
|
|
|| (digsignfncnt == 2 && signature->digest_sign_init == NULL)
|
|
|
|
|| (digverifyfncnt != 0 && digverifyfncnt != 2)
|
|
|
|
|| (digverifyfncnt == 2 && signature->digest_verify_init == NULL)
|
|
|
|
|| (signature->digest_sign != NULL
|
|
|
|
&& signature->digest_sign_init == NULL)
|
|
|
|
|| (signature->digest_verify != NULL
|
|
|
|
&& signature->digest_verify_init == NULL)
|
2020-01-12 09:32:12 +08:00
|
|
|
|| (gparamfncnt != 0 && gparamfncnt != 2)
|
|
|
|
|| (sparamfncnt != 0 && sparamfncnt != 2)
|
|
|
|
|| (gmdparamfncnt != 0 && gmdparamfncnt != 2)
|
|
|
|
|| (smdparamfncnt != 0 && smdparamfncnt != 2)) {
|
|
|
|
/*
|
|
|
|
* In order to be a consistent set of functions we must have at least
|
|
|
|
* a set of context functions (newctx and freectx) as well as a set of
|
|
|
|
* "signature" functions:
|
|
|
|
* (sign_init, sign) or
|
|
|
|
* (verify_init verify) or
|
|
|
|
* (verify_recover_init, verify_recover) or
|
|
|
|
* (digest_sign_init, digest_sign_update, digest_sign_final) or
|
2020-03-05 23:40:48 +08:00
|
|
|
* (digest_verify_init, digest_verify_update, digest_verify_final) or
|
|
|
|
* (digest_sign_init, digest_sign) or
|
|
|
|
* (digest_verify_init, digest_verify).
|
2020-01-12 09:32:12 +08:00
|
|
|
*
|
|
|
|
* set_ctx_params and settable_ctx_params are optional, but if one of
|
|
|
|
* them is present then the other one must also be present. The same
|
|
|
|
* applies to get_ctx_params and gettable_ctx_params. The same rules
|
|
|
|
* apply to the "md_params" functions. The dupctx function is optional.
|
|
|
|
*/
|
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
return signature;
|
|
|
|
err:
|
|
|
|
EVP_SIGNATURE_free(signature);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void EVP_SIGNATURE_free(EVP_SIGNATURE *signature)
|
|
|
|
{
|
2021-02-16 01:31:36 +08:00
|
|
|
int i;
|
2020-01-12 09:32:12 +08:00
|
|
|
|
2021-02-16 01:31:36 +08:00
|
|
|
if (signature == NULL)
|
|
|
|
return;
|
2023-06-22 07:48:49 +08:00
|
|
|
CRYPTO_DOWN_REF(&signature->refcnt, &i);
|
2021-02-16 01:31:36 +08:00
|
|
|
if (i > 0)
|
|
|
|
return;
|
2021-04-16 22:22:03 +08:00
|
|
|
OPENSSL_free(signature->type_name);
|
2021-02-16 01:31:36 +08:00
|
|
|
ossl_provider_free(signature->prov);
|
2023-06-22 07:48:49 +08:00
|
|
|
CRYPTO_FREE_REF(&signature->refcnt);
|
2021-02-16 01:31:36 +08:00
|
|
|
OPENSSL_free(signature);
|
2020-01-12 09:32:12 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int EVP_SIGNATURE_up_ref(EVP_SIGNATURE *signature)
|
|
|
|
{
|
|
|
|
int ref = 0;
|
|
|
|
|
2023-06-22 07:48:49 +08:00
|
|
|
CRYPTO_UP_REF(&signature->refcnt, &ref);
|
2020-01-12 09:32:12 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
Rename all getters to use get/get0 in name
For functions that exist in 1.1.1 provide a simple aliases via #define.
Fixes #15236
Functions with OSSL_DECODER_, OSSL_ENCODER_, OSSL_STORE_LOADER_,
EVP_KEYEXCH_, EVP_KEM_, EVP_ASYM_CIPHER_, EVP_SIGNATURE_,
EVP_KEYMGMT_, EVP_RAND_, EVP_MAC_, EVP_KDF_, EVP_PKEY_,
EVP_MD_, and EVP_CIPHER_ prefixes are renamed.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15405)
2021-05-21 22:58:08 +08:00
|
|
|
OSSL_PROVIDER *EVP_SIGNATURE_get0_provider(const EVP_SIGNATURE *signature)
|
2020-01-12 09:32:12 +08:00
|
|
|
{
|
|
|
|
return signature->prov;
|
|
|
|
}
|
|
|
|
|
2020-10-15 17:55:50 +08:00
|
|
|
EVP_SIGNATURE *EVP_SIGNATURE_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
|
2020-01-12 09:32:12 +08:00
|
|
|
const char *properties)
|
|
|
|
{
|
|
|
|
return evp_generic_fetch(ctx, OSSL_OP_SIGNATURE, algorithm, properties,
|
2021-03-16 21:14:43 +08:00
|
|
|
evp_signature_from_algorithm,
|
2020-01-12 09:32:12 +08:00
|
|
|
(int (*)(void *))EVP_SIGNATURE_up_ref,
|
|
|
|
(void (*)(void *))EVP_SIGNATURE_free);
|
|
|
|
}
|
|
|
|
|
2021-10-01 18:06:52 +08:00
|
|
|
EVP_SIGNATURE *evp_signature_fetch_from_prov(OSSL_PROVIDER *prov,
|
|
|
|
const char *algorithm,
|
|
|
|
const char *properties)
|
|
|
|
{
|
|
|
|
return evp_generic_fetch_from_prov(prov, OSSL_OP_SIGNATURE,
|
|
|
|
algorithm, properties,
|
|
|
|
evp_signature_from_algorithm,
|
|
|
|
(int (*)(void *))EVP_SIGNATURE_up_ref,
|
|
|
|
(void (*)(void *))EVP_SIGNATURE_free);
|
|
|
|
}
|
|
|
|
|
2020-01-12 09:32:12 +08:00
|
|
|
int EVP_SIGNATURE_is_a(const EVP_SIGNATURE *signature, const char *name)
|
|
|
|
{
|
2022-07-14 13:17:41 +08:00
|
|
|
return signature != NULL
|
|
|
|
&& evp_is_a(signature->prov, signature->name_id, NULL, name);
|
2020-01-12 09:32:12 +08:00
|
|
|
}
|
|
|
|
|
2021-06-01 19:18:04 +08:00
|
|
|
int evp_signature_get_number(const EVP_SIGNATURE *signature)
|
2020-01-12 09:32:12 +08:00
|
|
|
{
|
|
|
|
return signature->name_id;
|
|
|
|
}
|
|
|
|
|
Rename all getters to use get/get0 in name
For functions that exist in 1.1.1 provide a simple aliases via #define.
Fixes #15236
Functions with OSSL_DECODER_, OSSL_ENCODER_, OSSL_STORE_LOADER_,
EVP_KEYEXCH_, EVP_KEM_, EVP_ASYM_CIPHER_, EVP_SIGNATURE_,
EVP_KEYMGMT_, EVP_RAND_, EVP_MAC_, EVP_KDF_, EVP_PKEY_,
EVP_MD_, and EVP_CIPHER_ prefixes are renamed.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15405)
2021-05-21 22:58:08 +08:00
|
|
|
const char *EVP_SIGNATURE_get0_name(const EVP_SIGNATURE *signature)
|
2021-04-16 22:22:03 +08:00
|
|
|
{
|
|
|
|
return signature->type_name;
|
|
|
|
}
|
|
|
|
|
Rename all getters to use get/get0 in name
For functions that exist in 1.1.1 provide a simple aliases via #define.
Fixes #15236
Functions with OSSL_DECODER_, OSSL_ENCODER_, OSSL_STORE_LOADER_,
EVP_KEYEXCH_, EVP_KEM_, EVP_ASYM_CIPHER_, EVP_SIGNATURE_,
EVP_KEYMGMT_, EVP_RAND_, EVP_MAC_, EVP_KDF_, EVP_PKEY_,
EVP_MD_, and EVP_CIPHER_ prefixes are renamed.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15405)
2021-05-21 22:58:08 +08:00
|
|
|
const char *EVP_SIGNATURE_get0_description(const EVP_SIGNATURE *signature)
|
EVP: Add EVP_<TYPE>_description()
The following operation types are covered:
EVP_MD, EVP_CIPHER, EVP_MAC, EVP_RAND, EVP_KEYMGMT, EVP_SIGNATURE,
EVP_ASYM_CIPHER, EVP_KEM, EVP_KEYEXCH, EVP_KDF. Also EVP_PKEY.
For EVP_MD and EVP_CIPHER, OBJ_nid2ln() is used as a fallback for
legacy implementations.
For EVP_PKEY, the info field of the EVP_PKEY_ASN1_METHOD is used as a
fallback for legacy implementations.
Fixes #14514
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14656)
2021-03-16 21:23:54 +08:00
|
|
|
{
|
|
|
|
return signature->description;
|
|
|
|
}
|
|
|
|
|
2020-10-15 17:55:50 +08:00
|
|
|
void EVP_SIGNATURE_do_all_provided(OSSL_LIB_CTX *libctx,
|
2020-01-12 09:32:12 +08:00
|
|
|
void (*fn)(EVP_SIGNATURE *signature,
|
|
|
|
void *arg),
|
|
|
|
void *arg)
|
|
|
|
{
|
|
|
|
evp_generic_do_all(libctx, OSSL_OP_SIGNATURE,
|
|
|
|
(void (*)(void *, void *))fn, arg,
|
2021-03-16 21:14:43 +08:00
|
|
|
evp_signature_from_algorithm,
|
2021-06-09 13:52:09 +08:00
|
|
|
(int (*)(void *))EVP_SIGNATURE_up_ref,
|
2020-01-12 09:32:12 +08:00
|
|
|
(void (*)(void *))EVP_SIGNATURE_free);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2021-02-20 01:03:43 +08:00
|
|
|
int EVP_SIGNATURE_names_do_all(const EVP_SIGNATURE *signature,
|
|
|
|
void (*fn)(const char *name, void *data),
|
|
|
|
void *data)
|
2020-01-12 09:32:12 +08:00
|
|
|
{
|
|
|
|
if (signature->prov != NULL)
|
2021-02-20 01:03:43 +08:00
|
|
|
return evp_names_do_all(signature->prov, signature->name_id, fn, data);
|
|
|
|
|
|
|
|
return 1;
|
2020-01-12 09:32:12 +08:00
|
|
|
}
|
|
|
|
|
2020-08-12 09:59:43 +08:00
|
|
|
const OSSL_PARAM *EVP_SIGNATURE_gettable_ctx_params(const EVP_SIGNATURE *sig)
|
|
|
|
{
|
|
|
|
void *provctx;
|
|
|
|
|
|
|
|
if (sig == NULL || sig->gettable_ctx_params == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
Rename all getters to use get/get0 in name
For functions that exist in 1.1.1 provide a simple aliases via #define.
Fixes #15236
Functions with OSSL_DECODER_, OSSL_ENCODER_, OSSL_STORE_LOADER_,
EVP_KEYEXCH_, EVP_KEM_, EVP_ASYM_CIPHER_, EVP_SIGNATURE_,
EVP_KEYMGMT_, EVP_RAND_, EVP_MAC_, EVP_KDF_, EVP_PKEY_,
EVP_MD_, and EVP_CIPHER_ prefixes are renamed.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15405)
2021-05-21 22:58:08 +08:00
|
|
|
provctx = ossl_provider_ctx(EVP_SIGNATURE_get0_provider(sig));
|
2021-02-27 01:02:36 +08:00
|
|
|
return sig->gettable_ctx_params(NULL, provctx);
|
2020-08-12 09:59:43 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
const OSSL_PARAM *EVP_SIGNATURE_settable_ctx_params(const EVP_SIGNATURE *sig)
|
|
|
|
{
|
|
|
|
void *provctx;
|
|
|
|
|
|
|
|
if (sig == NULL || sig->settable_ctx_params == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
Rename all getters to use get/get0 in name
For functions that exist in 1.1.1 provide a simple aliases via #define.
Fixes #15236
Functions with OSSL_DECODER_, OSSL_ENCODER_, OSSL_STORE_LOADER_,
EVP_KEYEXCH_, EVP_KEM_, EVP_ASYM_CIPHER_, EVP_SIGNATURE_,
EVP_KEYMGMT_, EVP_RAND_, EVP_MAC_, EVP_KDF_, EVP_PKEY_,
EVP_MD_, and EVP_CIPHER_ prefixes are renamed.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15405)
2021-05-21 22:58:08 +08:00
|
|
|
provctx = ossl_provider_ctx(EVP_SIGNATURE_get0_provider(sig));
|
2021-02-27 01:02:36 +08:00
|
|
|
return sig->settable_ctx_params(NULL, provctx);
|
2020-08-12 09:59:43 +08:00
|
|
|
}
|
|
|
|
|
2021-03-02 18:20:25 +08:00
|
|
|
static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, int operation,
|
|
|
|
const OSSL_PARAM params[])
|
2020-01-12 09:32:12 +08:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
void *provkey = NULL;
|
|
|
|
EVP_SIGNATURE *signature = NULL;
|
2020-01-14 21:11:47 +08:00
|
|
|
EVP_KEYMGMT *tmp_keymgmt = NULL;
|
2021-10-01 20:05:02 +08:00
|
|
|
const OSSL_PROVIDER *tmp_prov = NULL;
|
2020-01-14 21:11:47 +08:00
|
|
|
const char *supported_sig = NULL;
|
2021-10-01 20:05:02 +08:00
|
|
|
int iter;
|
2020-01-12 09:32:12 +08:00
|
|
|
|
|
|
|
if (ctx == NULL) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
2020-01-12 09:32:12 +08:00
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
evp_pkey_ctx_free_old_ops(ctx);
|
|
|
|
ctx->operation = operation;
|
|
|
|
|
2020-01-11 00:50:03 +08:00
|
|
|
ERR_set_mark();
|
|
|
|
|
2020-09-30 23:22:27 +08:00
|
|
|
if (evp_pkey_ctx_is_legacy(ctx))
|
2020-01-12 09:32:12 +08:00
|
|
|
goto legacy;
|
|
|
|
|
2021-10-01 21:02:15 +08:00
|
|
|
if (ctx->pkey == NULL) {
|
|
|
|
ERR_clear_last_mark();
|
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_NO_KEY_SET);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2020-02-21 03:26:16 +08:00
|
|
|
/*
|
EVP: Reverse the fetch logic in all pkey using functionality
In all initializing functions for functionality that use an EVP_PKEY, the
coded logic was to find an KEYMGMT implementation first, and then try to
find the operation method (for example, SIGNATURE implementation) in the
same provider.
This implies that in providers where there is a KEYMGMT implementation,
there must also be a SIGNATURE implementation, along with a KEYEXCH,
ASYM_CIPHER, etc implementation.
The intended design was, however, the opposite implication, i.e. that
where there is a SIGNATURE implementation, there must also be KEYMGMT.
This change reverses the logic of the code to be closer to the intended
design.
There is a consequence; we now use the query_operation_name function from
the KEYMGMT of the EVP_PKEY given by the EVP_PKEY_CTX (ultimately given by
the application). Previously, we used the query_operation_name function
from the KEYMGMT found alongside the SIGNATURE implementation.
Another minor consequence is that the |keymgmt| field in EVP_PKEY_CTX
is now always a reference to the KEYMGMT of the |pkey| field if that
one is given (|pkey| isn't NULL) and is provided (|pkey->keymgmt|
isn't NULL).
Fixes #16614
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16725)
2021-10-01 14:57:03 +08:00
|
|
|
* Try to derive the supported signature from |ctx->keymgmt|.
|
2020-02-21 03:26:16 +08:00
|
|
|
*/
|
EVP: Reverse the fetch logic in all pkey using functionality
In all initializing functions for functionality that use an EVP_PKEY, the
coded logic was to find an KEYMGMT implementation first, and then try to
find the operation method (for example, SIGNATURE implementation) in the
same provider.
This implies that in providers where there is a KEYMGMT implementation,
there must also be a SIGNATURE implementation, along with a KEYEXCH,
ASYM_CIPHER, etc implementation.
The intended design was, however, the opposite implication, i.e. that
where there is a SIGNATURE implementation, there must also be KEYMGMT.
This change reverses the logic of the code to be closer to the intended
design.
There is a consequence; we now use the query_operation_name function from
the KEYMGMT of the EVP_PKEY given by the EVP_PKEY_CTX (ultimately given by
the application). Previously, we used the query_operation_name function
from the KEYMGMT found alongside the SIGNATURE implementation.
Another minor consequence is that the |keymgmt| field in EVP_PKEY_CTX
is now always a reference to the KEYMGMT of the |pkey| field if that
one is given (|pkey| isn't NULL) and is provided (|pkey->keymgmt|
isn't NULL).
Fixes #16614
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16725)
2021-10-01 14:57:03 +08:00
|
|
|
if (!ossl_assert(ctx->pkey->keymgmt == NULL
|
|
|
|
|| ctx->pkey->keymgmt == ctx->keymgmt)) {
|
|
|
|
ERR_clear_last_mark();
|
|
|
|
ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
supported_sig = evp_keymgmt_util_query_operation_name(ctx->keymgmt,
|
|
|
|
OSSL_OP_SIGNATURE);
|
|
|
|
if (supported_sig == NULL) {
|
2020-01-11 00:50:03 +08:00
|
|
|
ERR_clear_last_mark();
|
2020-01-14 21:11:47 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
|
|
|
|
goto err;
|
2020-01-12 09:32:12 +08:00
|
|
|
}
|
2020-01-14 21:11:47 +08:00
|
|
|
|
|
|
|
/*
|
2021-10-01 20:05:02 +08:00
|
|
|
* We perform two iterations:
|
|
|
|
*
|
|
|
|
* 1. Do the normal signature fetch, using the fetching data given by
|
|
|
|
* the EVP_PKEY_CTX.
|
|
|
|
* 2. Do the provider specific signature fetch, from the same provider
|
|
|
|
* as |ctx->keymgmt|
|
|
|
|
*
|
|
|
|
* We then try to fetch the keymgmt from the same provider as the
|
|
|
|
* signature, and try to export |ctx->pkey| to that keymgmt (when
|
|
|
|
* this keymgmt happens to be the same as |ctx->keymgmt|, the export
|
|
|
|
* is a no-op, but we call it anyway to not complicate the code even
|
|
|
|
* more).
|
|
|
|
* If the export call succeeds (returns a non-NULL provider key pointer),
|
|
|
|
* we're done and can perform the operation itself. If not, we perform
|
|
|
|
* the second iteration, or jump to legacy.
|
2020-01-14 21:11:47 +08:00
|
|
|
*/
|
2021-10-01 20:05:02 +08:00
|
|
|
for (iter = 1; iter < 3 && provkey == NULL; iter++) {
|
2021-10-04 21:33:37 +08:00
|
|
|
EVP_KEYMGMT *tmp_keymgmt_tofree = NULL;
|
2020-01-14 21:11:47 +08:00
|
|
|
|
2021-10-01 20:05:02 +08:00
|
|
|
/*
|
|
|
|
* If we're on the second iteration, free the results from the first.
|
|
|
|
* They are NULL on the first iteration, so no need to check what
|
|
|
|
* iteration we're on.
|
|
|
|
*/
|
|
|
|
EVP_SIGNATURE_free(signature);
|
|
|
|
EVP_KEYMGMT_free(tmp_keymgmt);
|
|
|
|
|
|
|
|
switch (iter) {
|
|
|
|
case 1:
|
|
|
|
signature =
|
|
|
|
EVP_SIGNATURE_fetch(ctx->libctx, supported_sig, ctx->propquery);
|
|
|
|
if (signature != NULL)
|
|
|
|
tmp_prov = EVP_SIGNATURE_get0_provider(signature);
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
tmp_prov = EVP_KEYMGMT_get0_provider(ctx->keymgmt);
|
|
|
|
signature =
|
|
|
|
evp_signature_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
|
|
|
|
supported_sig, ctx->propquery);
|
|
|
|
if (signature == NULL)
|
|
|
|
goto legacy;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (signature == NULL)
|
|
|
|
continue;
|
2020-01-12 09:32:12 +08:00
|
|
|
|
2021-10-01 20:05:02 +08:00
|
|
|
/*
|
|
|
|
* Ensure that the key is provided, either natively, or as a cached
|
|
|
|
* export. We start by fetching the keymgmt with the same name as
|
|
|
|
* |ctx->pkey|, but from the provider of the signature method, using
|
|
|
|
* the same property query as when fetching the signature method.
|
|
|
|
* With the keymgmt we found (if we did), we try to export |ctx->pkey|
|
|
|
|
* to it (evp_pkey_export_to_provider() is smart enough to only actually
|
|
|
|
|
|
|
|
* export it if |tmp_keymgmt| is different from |ctx->pkey|'s keymgmt)
|
|
|
|
*/
|
|
|
|
tmp_keymgmt_tofree = tmp_keymgmt =
|
|
|
|
evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
|
|
|
|
EVP_KEYMGMT_get0_name(ctx->keymgmt),
|
|
|
|
ctx->propquery);
|
|
|
|
if (tmp_keymgmt != NULL)
|
|
|
|
provkey = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
|
|
|
|
&tmp_keymgmt, ctx->propquery);
|
|
|
|
if (tmp_keymgmt == NULL)
|
|
|
|
EVP_KEYMGMT_free(tmp_keymgmt_tofree);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (provkey == NULL) {
|
|
|
|
EVP_SIGNATURE_free(signature);
|
EVP: Reverse the fetch logic in all pkey using functionality
In all initializing functions for functionality that use an EVP_PKEY, the
coded logic was to find an KEYMGMT implementation first, and then try to
find the operation method (for example, SIGNATURE implementation) in the
same provider.
This implies that in providers where there is a KEYMGMT implementation,
there must also be a SIGNATURE implementation, along with a KEYEXCH,
ASYM_CIPHER, etc implementation.
The intended design was, however, the opposite implication, i.e. that
where there is a SIGNATURE implementation, there must also be KEYMGMT.
This change reverses the logic of the code to be closer to the intended
design.
There is a consequence; we now use the query_operation_name function from
the KEYMGMT of the EVP_PKEY given by the EVP_PKEY_CTX (ultimately given by
the application). Previously, we used the query_operation_name function
from the KEYMGMT found alongside the SIGNATURE implementation.
Another minor consequence is that the |keymgmt| field in EVP_PKEY_CTX
is now always a reference to the KEYMGMT of the |pkey| field if that
one is given (|pkey| isn't NULL) and is provided (|pkey->keymgmt|
isn't NULL).
Fixes #16614
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16725)
2021-10-01 14:57:03 +08:00
|
|
|
goto legacy;
|
2021-10-01 20:05:02 +08:00
|
|
|
}
|
EVP: Reverse the fetch logic in all pkey using functionality
In all initializing functions for functionality that use an EVP_PKEY, the
coded logic was to find an KEYMGMT implementation first, and then try to
find the operation method (for example, SIGNATURE implementation) in the
same provider.
This implies that in providers where there is a KEYMGMT implementation,
there must also be a SIGNATURE implementation, along with a KEYEXCH,
ASYM_CIPHER, etc implementation.
The intended design was, however, the opposite implication, i.e. that
where there is a SIGNATURE implementation, there must also be KEYMGMT.
This change reverses the logic of the code to be closer to the intended
design.
There is a consequence; we now use the query_operation_name function from
the KEYMGMT of the EVP_PKEY given by the EVP_PKEY_CTX (ultimately given by
the application). Previously, we used the query_operation_name function
from the KEYMGMT found alongside the SIGNATURE implementation.
Another minor consequence is that the |keymgmt| field in EVP_PKEY_CTX
is now always a reference to the KEYMGMT of the |pkey| field if that
one is given (|pkey| isn't NULL) and is provided (|pkey->keymgmt|
isn't NULL).
Fixes #16614
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16725)
2021-10-01 14:57:03 +08:00
|
|
|
|
2020-01-11 00:50:03 +08:00
|
|
|
ERR_pop_to_mark();
|
|
|
|
|
|
|
|
/* No more legacy from here down to legacy: */
|
|
|
|
|
2020-01-12 09:32:12 +08:00
|
|
|
ctx->op.sig.signature = signature;
|
2021-05-14 11:08:42 +08:00
|
|
|
ctx->op.sig.algctx =
|
2020-05-07 03:44:58 +08:00
|
|
|
signature->newctx(ossl_provider_ctx(signature->prov), ctx->propquery);
|
2021-05-14 11:08:42 +08:00
|
|
|
if (ctx->op.sig.algctx == NULL) {
|
2020-01-12 09:32:12 +08:00
|
|
|
/* The provider key can stay in the cache */
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
|
2020-01-12 09:32:12 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (operation) {
|
|
|
|
case EVP_PKEY_OP_SIGN:
|
|
|
|
if (signature->sign_init == NULL) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
2020-01-12 09:32:12 +08:00
|
|
|
ret = -2;
|
|
|
|
goto err;
|
|
|
|
}
|
2021-05-14 11:08:42 +08:00
|
|
|
ret = signature->sign_init(ctx->op.sig.algctx, provkey, params);
|
2020-01-12 09:32:12 +08:00
|
|
|
break;
|
|
|
|
case EVP_PKEY_OP_VERIFY:
|
|
|
|
if (signature->verify_init == NULL) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
2020-01-12 09:32:12 +08:00
|
|
|
ret = -2;
|
|
|
|
goto err;
|
|
|
|
}
|
2021-05-14 11:08:42 +08:00
|
|
|
ret = signature->verify_init(ctx->op.sig.algctx, provkey, params);
|
2020-01-12 09:32:12 +08:00
|
|
|
break;
|
|
|
|
case EVP_PKEY_OP_VERIFYRECOVER:
|
|
|
|
if (signature->verify_recover_init == NULL) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
2020-01-12 09:32:12 +08:00
|
|
|
ret = -2;
|
|
|
|
goto err;
|
|
|
|
}
|
2021-05-14 11:08:42 +08:00
|
|
|
ret = signature->verify_recover_init(ctx->op.sig.algctx, provkey,
|
2021-03-02 18:20:25 +08:00
|
|
|
params);
|
2020-01-12 09:32:12 +08:00
|
|
|
break;
|
|
|
|
default:
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
|
2020-01-12 09:32:12 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret <= 0) {
|
2021-05-14 11:08:42 +08:00
|
|
|
signature->freectx(ctx->op.sig.algctx);
|
|
|
|
ctx->op.sig.algctx = NULL;
|
2020-01-12 09:32:12 +08:00
|
|
|
goto err;
|
|
|
|
}
|
2020-09-02 21:54:13 +08:00
|
|
|
goto end;
|
2020-01-12 09:32:12 +08:00
|
|
|
|
|
|
|
legacy:
|
2020-01-11 00:50:03 +08:00
|
|
|
/*
|
|
|
|
* If we don't have the full support we need with provided methods,
|
|
|
|
* let's go see if legacy does.
|
|
|
|
*/
|
|
|
|
ERR_pop_to_mark();
|
EVP: Reverse the fetch logic in all pkey using functionality
In all initializing functions for functionality that use an EVP_PKEY, the
coded logic was to find an KEYMGMT implementation first, and then try to
find the operation method (for example, SIGNATURE implementation) in the
same provider.
This implies that in providers where there is a KEYMGMT implementation,
there must also be a SIGNATURE implementation, along with a KEYEXCH,
ASYM_CIPHER, etc implementation.
The intended design was, however, the opposite implication, i.e. that
where there is a SIGNATURE implementation, there must also be KEYMGMT.
This change reverses the logic of the code to be closer to the intended
design.
There is a consequence; we now use the query_operation_name function from
the KEYMGMT of the EVP_PKEY given by the EVP_PKEY_CTX (ultimately given by
the application). Previously, we used the query_operation_name function
from the KEYMGMT found alongside the SIGNATURE implementation.
Another minor consequence is that the |keymgmt| field in EVP_PKEY_CTX
is now always a reference to the KEYMGMT of the |pkey| field if that
one is given (|pkey| isn't NULL) and is provided (|pkey->keymgmt|
isn't NULL).
Fixes #16614
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16725)
2021-10-01 14:57:03 +08:00
|
|
|
EVP_KEYMGMT_free(tmp_keymgmt);
|
|
|
|
tmp_keymgmt = NULL;
|
2020-01-11 00:50:03 +08:00
|
|
|
|
2020-01-12 09:32:12 +08:00
|
|
|
if (ctx->pmeth == NULL
|
|
|
|
|| (operation == EVP_PKEY_OP_SIGN && ctx->pmeth->sign == NULL)
|
|
|
|
|| (operation == EVP_PKEY_OP_VERIFY && ctx->pmeth->verify == NULL)
|
|
|
|
|| (operation == EVP_PKEY_OP_VERIFYRECOVER
|
|
|
|
&& ctx->pmeth->verify_recover == NULL)) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
2020-01-12 09:32:12 +08:00
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (operation) {
|
|
|
|
case EVP_PKEY_OP_SIGN:
|
|
|
|
if (ctx->pmeth->sign_init == NULL)
|
|
|
|
return 1;
|
|
|
|
ret = ctx->pmeth->sign_init(ctx);
|
|
|
|
break;
|
|
|
|
case EVP_PKEY_OP_VERIFY:
|
|
|
|
if (ctx->pmeth->verify_init == NULL)
|
|
|
|
return 1;
|
|
|
|
ret = ctx->pmeth->verify_init(ctx);
|
|
|
|
break;
|
|
|
|
case EVP_PKEY_OP_VERIFYRECOVER:
|
|
|
|
if (ctx->pmeth->verify_recover_init == NULL)
|
|
|
|
return 1;
|
|
|
|
ret = ctx->pmeth->verify_recover_init(ctx);
|
|
|
|
break;
|
|
|
|
default:
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
|
2020-01-12 09:32:12 +08:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (ret <= 0)
|
|
|
|
goto err;
|
2020-09-02 21:54:13 +08:00
|
|
|
end:
|
|
|
|
#ifndef FIPS_MODULE
|
|
|
|
if (ret > 0)
|
|
|
|
ret = evp_pkey_ctx_use_cached_data(ctx);
|
|
|
|
#endif
|
2020-01-12 09:32:12 +08:00
|
|
|
|
EVP: Reverse the fetch logic in all pkey using functionality
In all initializing functions for functionality that use an EVP_PKEY, the
coded logic was to find an KEYMGMT implementation first, and then try to
find the operation method (for example, SIGNATURE implementation) in the
same provider.
This implies that in providers where there is a KEYMGMT implementation,
there must also be a SIGNATURE implementation, along with a KEYEXCH,
ASYM_CIPHER, etc implementation.
The intended design was, however, the opposite implication, i.e. that
where there is a SIGNATURE implementation, there must also be KEYMGMT.
This change reverses the logic of the code to be closer to the intended
design.
There is a consequence; we now use the query_operation_name function from
the KEYMGMT of the EVP_PKEY given by the EVP_PKEY_CTX (ultimately given by
the application). Previously, we used the query_operation_name function
from the KEYMGMT found alongside the SIGNATURE implementation.
Another minor consequence is that the |keymgmt| field in EVP_PKEY_CTX
is now always a reference to the KEYMGMT of the |pkey| field if that
one is given (|pkey| isn't NULL) and is provided (|pkey->keymgmt|
isn't NULL).
Fixes #16614
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16725)
2021-10-01 14:57:03 +08:00
|
|
|
EVP_KEYMGMT_free(tmp_keymgmt);
|
2020-09-02 21:54:13 +08:00
|
|
|
return ret;
|
2020-01-12 09:32:12 +08:00
|
|
|
err:
|
2020-05-07 02:48:25 +08:00
|
|
|
evp_pkey_ctx_free_old_ops(ctx);
|
2020-01-12 09:32:12 +08:00
|
|
|
ctx->operation = EVP_PKEY_OP_UNDEFINED;
|
EVP: Reverse the fetch logic in all pkey using functionality
In all initializing functions for functionality that use an EVP_PKEY, the
coded logic was to find an KEYMGMT implementation first, and then try to
find the operation method (for example, SIGNATURE implementation) in the
same provider.
This implies that in providers where there is a KEYMGMT implementation,
there must also be a SIGNATURE implementation, along with a KEYEXCH,
ASYM_CIPHER, etc implementation.
The intended design was, however, the opposite implication, i.e. that
where there is a SIGNATURE implementation, there must also be KEYMGMT.
This change reverses the logic of the code to be closer to the intended
design.
There is a consequence; we now use the query_operation_name function from
the KEYMGMT of the EVP_PKEY given by the EVP_PKEY_CTX (ultimately given by
the application). Previously, we used the query_operation_name function
from the KEYMGMT found alongside the SIGNATURE implementation.
Another minor consequence is that the |keymgmt| field in EVP_PKEY_CTX
is now always a reference to the KEYMGMT of the |pkey| field if that
one is given (|pkey| isn't NULL) and is provided (|pkey->keymgmt|
isn't NULL).
Fixes #16614
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16725)
2021-10-01 14:57:03 +08:00
|
|
|
EVP_KEYMGMT_free(tmp_keymgmt);
|
2020-01-12 09:32:12 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx)
|
|
|
|
{
|
2021-03-02 18:20:25 +08:00
|
|
|
return evp_pkey_signature_init(ctx, EVP_PKEY_OP_SIGN, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
int EVP_PKEY_sign_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
|
|
|
|
{
|
|
|
|
return evp_pkey_signature_init(ctx, EVP_PKEY_OP_SIGN, params);
|
2020-01-12 09:32:12 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int EVP_PKEY_sign(EVP_PKEY_CTX *ctx,
|
|
|
|
unsigned char *sig, size_t *siglen,
|
|
|
|
const unsigned char *tbs, size_t tbslen)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (ctx == NULL) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
2020-01-12 09:32:12 +08:00
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ctx->operation != EVP_PKEY_OP_SIGN) {
|
2021-03-05 00:01:50 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_INITIALIZED);
|
2020-01-12 09:32:12 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2021-05-14 11:08:42 +08:00
|
|
|
if (ctx->op.sig.algctx == NULL)
|
2020-01-12 09:32:12 +08:00
|
|
|
goto legacy;
|
|
|
|
|
2021-05-14 11:08:42 +08:00
|
|
|
ret = ctx->op.sig.signature->sign(ctx->op.sig.algctx, sig, siglen,
|
2021-10-07 18:33:17 +08:00
|
|
|
(sig == NULL) ? 0 : *siglen, tbs, tbslen);
|
2020-01-12 09:32:12 +08:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
legacy:
|
|
|
|
|
|
|
|
if (ctx->pmeth == NULL || ctx->pmeth->sign == NULL) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
2020-01-12 09:32:12 +08:00
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
M_check_autoarg(ctx, sig, siglen, EVP_F_EVP_PKEY_SIGN)
|
|
|
|
return ctx->pmeth->sign(ctx, sig, siglen, tbs, tbslen);
|
|
|
|
}
|
|
|
|
|
|
|
|
int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx)
|
|
|
|
{
|
2021-03-02 18:20:25 +08:00
|
|
|
return evp_pkey_signature_init(ctx, EVP_PKEY_OP_VERIFY, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
int EVP_PKEY_verify_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
|
|
|
|
{
|
|
|
|
return evp_pkey_signature_init(ctx, EVP_PKEY_OP_VERIFY, params);
|
2020-01-12 09:32:12 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int EVP_PKEY_verify(EVP_PKEY_CTX *ctx,
|
|
|
|
const unsigned char *sig, size_t siglen,
|
|
|
|
const unsigned char *tbs, size_t tbslen)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (ctx == NULL) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
2020-01-12 09:32:12 +08:00
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ctx->operation != EVP_PKEY_OP_VERIFY) {
|
2021-03-05 00:01:50 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_INITIALIZED);
|
2020-01-12 09:32:12 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2021-05-14 11:08:42 +08:00
|
|
|
if (ctx->op.sig.algctx == NULL)
|
2020-01-12 09:32:12 +08:00
|
|
|
goto legacy;
|
|
|
|
|
2021-05-14 11:08:42 +08:00
|
|
|
ret = ctx->op.sig.signature->verify(ctx->op.sig.algctx, sig, siglen,
|
2020-01-12 09:32:12 +08:00
|
|
|
tbs, tbslen);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
legacy:
|
|
|
|
if (ctx->pmeth == NULL || ctx->pmeth->verify == NULL) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
2020-01-12 09:32:12 +08:00
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ctx->pmeth->verify(ctx, sig, siglen, tbs, tbslen);
|
|
|
|
}
|
|
|
|
|
|
|
|
int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx)
|
|
|
|
{
|
2021-03-02 18:20:25 +08:00
|
|
|
return evp_pkey_signature_init(ctx, EVP_PKEY_OP_VERIFYRECOVER, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
int EVP_PKEY_verify_recover_init_ex(EVP_PKEY_CTX *ctx,
|
|
|
|
const OSSL_PARAM params[])
|
|
|
|
{
|
|
|
|
return evp_pkey_signature_init(ctx, EVP_PKEY_OP_VERIFYRECOVER, params);
|
2020-01-12 09:32:12 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx,
|
|
|
|
unsigned char *rout, size_t *routlen,
|
|
|
|
const unsigned char *sig, size_t siglen)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (ctx == NULL) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
2020-01-12 09:32:12 +08:00
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ctx->operation != EVP_PKEY_OP_VERIFYRECOVER) {
|
2021-03-05 00:01:50 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_INITIALIZED);
|
2020-01-12 09:32:12 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2021-05-14 11:08:42 +08:00
|
|
|
if (ctx->op.sig.algctx == NULL)
|
2020-01-12 09:32:12 +08:00
|
|
|
goto legacy;
|
|
|
|
|
2021-05-14 11:08:42 +08:00
|
|
|
ret = ctx->op.sig.signature->verify_recover(ctx->op.sig.algctx, rout,
|
2020-01-12 09:32:12 +08:00
|
|
|
routlen,
|
|
|
|
(rout == NULL ? 0 : *routlen),
|
|
|
|
sig, siglen);
|
|
|
|
return ret;
|
|
|
|
legacy:
|
|
|
|
if (ctx->pmeth == NULL || ctx->pmeth->verify_recover == NULL) {
|
2020-11-04 19:23:19 +08:00
|
|
|
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
|
2020-01-12 09:32:12 +08:00
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
M_check_autoarg(ctx, rout, routlen, EVP_F_EVP_PKEY_VERIFY_RECOVER)
|
|
|
|
return ctx->pmeth->verify_recover(ctx, rout, routlen, sig, siglen);
|
|
|
|
}
|