root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Make EVP_PKEY_check() be an alias for EVP_PKEY_pairwise_check() 

The implementation of EVP_PKEY_pairwise_check() is also changed
to handle the legacy keys.

Fixes #16046

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16069)
This commit is contained in:
Tomas Mraz 2021-07-13 17:41:02 +02:00 committed by Pauli
parent 54c0480dac
commit 11f18ef1f5
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crypto/evp/pmeth_check.c
View File

@ -152,26 +152,12 @@ int EVP_PKEY_private_check(EVP_PKEY_CTX *ctx)
return -2; return -2;
} }
int EVP_PKEY_pairwise_check(EVP_PKEY_CTX *ctx) int EVP_PKEY_check(EVP_PKEY_CTX *ctx)
{ {
EVP_PKEY *pkey = ctx->pkey; return EVP_PKEY_pairwise_check(ctx);
int ok;
if (pkey == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_NO_KEY_SET);
return 0;
}
if ((ok = try_provided_check(ctx, OSSL_KEYMGMT_SELECT_KEYPAIR,
OSSL_KEYMGMT_VALIDATE_FULL_CHECK)) != -1)
return ok;
/* not supported for legacy keys */
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
return -2;
} }
int EVP_PKEY_check(EVP_PKEY_CTX *ctx) int EVP_PKEY_pairwise_check(EVP_PKEY_CTX *ctx)
{ {
EVP_PKEY *pkey = ctx->pkey; EVP_PKEY *pkey = ctx->pkey;
int ok; int ok;

2
doc/man3/EVP_PKEY_check.pod
View File

@ -44,7 +44,7 @@ EVP_PKEY_private_check() validates the private component of the key given by B<c
EVP_PKEY_pairwise_check() validates that the public and private components have EVP_PKEY_pairwise_check() validates that the public and private components have
the correct mathematical relationship to each other for the key given by B<ctx>. the correct mathematical relationship to each other for the key given by B<ctx>.
EVP_PKEY_check() validates all components of a key given by B<ctx>. EVP_PKEY_check() is an alias for the EVP_PKEY_pairwise_check() function.
=head1 NOTES =head1 NOTES