Skip to content

EVP: Adapt EVP_PKEY checking, comparing and copying for provider keys, take 3#11158

Merged
openssl-machine merged 6 commits intoopenssl:masterfrom
levitte:provider-key-check+cmp+dup-take3
Mar 2, 2020
Merged

EVP: Adapt EVP_PKEY checking, comparing and copying for provider keys, take 3#11158
openssl-machine merged 6 commits intoopenssl:masterfrom
levitte:provider-key-check+cmp+dup-take3

Conversation

@levitte
Copy link
Member

@levitte levitte commented Feb 24, 2020 •
edited
Loading

This is an adaptation of the following functions for provided keys:

EVP_PKEY_copy_parameters()
EVP_PKEY_missing_parameters()
EVP_PKEY_cmp_parameters()
EVP_PKEY_cmp()

This also adds the necessary EVP_KEYMGMT interfaces to support those functions, and the implementations for RSA, DSA and DH.

This replaces #11025 and is built on top of #11148

@levitte levitte added branch: master Applies to master branch approval: review pending This pull request needs review by a committer labels Feb 24, 2020
@levitte levitte added this to the 3.0.0 milestone Feb 24, 2020
@levitte
Copy link
Member Author

levitte commented Feb 24, 2020

@slontis, I know that I still need to add ec_match...

@levitte levitte changed the title [Pending #11148] EVP: Adapt EVP_PKEY checking, comparing and copying for provider keys, take 3 [WIP, Pending #11148] EVP: Adapt EVP_PKEY checking, comparing and copying for provider keys, take 3 Feb 24, 2020
@levitte levitte changed the title [WIP, Pending #11148] EVP: Adapt EVP_PKEY checking, comparing and copying for provider keys, take 3 [WIP, Pending on #11148] EVP: Adapt EVP_PKEY checking, comparing and copying for provider keys, take 3 Feb 24, 2020
This was referenced Feb 24, 2020
Merged
Merged
Closed
slontis
slontis reviewed Feb 24, 2020
View reviewed changes
slontis
slontis reviewed Feb 24, 2020
View reviewed changes
slontis
slontis reviewed Feb 24, 2020
View reviewed changes
slontis
slontis reviewed Feb 24, 2020
View reviewed changes
slontis
slontis reviewed Feb 24, 2020
View reviewed changes
slontis
slontis reviewed Feb 24, 2020
View reviewed changes
slontis
slontis reviewed Feb 24, 2020
View reviewed changes
Copy link
Member

@slontis slontis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apart from a few small NITS, and a rebase + (ec_match) it looks good to me.

@levitte
Copy link
Member Author

levitte commented Feb 27, 2020

ec_match was added a few days ago.

@slontis
Copy link
Member

slontis commented Feb 27, 2020

travis failures again...

@levitte
Copy link
Member Author

levitte commented Feb 27, 2020

travis failures again...

Yup, that should fix itself as soon as #11148 is merged and this rebased on top of it.

@levitte levitte force-pushed the provider-key-check+cmp+dup-take3 branch from 18671d8 to 9ad2886 Compare February 29, 2020 04:54
@levitte levitte changed the title [WIP, Pending on #11148] EVP: Adapt EVP_PKEY checking, comparing and copying for provider keys, take 3 [WIP] EVP: Adapt EVP_PKEY checking, comparing and copying for provider keys, take 3 Feb 29, 2020
@levitte
Copy link
Member Author

levitte commented Feb 29, 2020 •
edited
Loading

Now that #11148 is merged, I cleaned up the commits and rebased. Let's see what the CIs say

@levitte levitte force-pushed the provider-key-check+cmp+dup-take3 branch from 9ad2886 to d191db4 Compare February 29, 2020 04:57
@slontis slontis added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Feb 29, 2020
@openssl-machine openssl-machine added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Mar 1, 2020
@openssl-machine
Copy link
Collaborator

openssl-machine commented Mar 1, 2020

This pull request is ready to merge

romen
romen reviewed Mar 1, 2020
View reviewed changes
@levitte levitte changed the title [WIP] EVP: Adapt EVP_PKEY checking, comparing and copying for provider keys, take 3 EVP: Adapt EVP_PKEY checking, comparing and copying for provider keys, take 3 Mar 2, 2020
levitte added 6 commits March 2, 2020 03:27
@levitte
EVP: Adapt EVP_PKEY_missing_parameters() for provider keys
157ded3 
Reviewed-by: Shane Lontis <[email protected]>
(Merged from openssl#11158)
@levitte
KEYMGMT: Add a keydata matching function
bee5d6c 
Reviewed-by: Shane Lontis <[email protected]>
(Merged from openssl#11158)
@levitte
EVP: Add support for comparing provided EVP_PKEYs
1e9101c 
This adds evp_keymgmt_util_match() and affects EVP_PKEY_cmp() and
EVP_PKEY_cmp_parameters().

The word 'match' was used for the new routines because many associate
'cmp' with comparison functions that allows sorting, i.e. return -1, 0
or 1 depending on the order in which the two compared elements should
be sorted.  EVP_PKEY_cmp() and EVP_PKEY_cmp_parameters() don't quite
do that.

Reviewed-by: Shane Lontis <[email protected]>
(Merged from openssl#11158)
@levitte
KEYMGMT: Add a keydata copy function
13697f1 
Reviewed-by: Shane Lontis <[email protected]>
(Merged from openssl#11158)
@levitte
EVP: Add support for copying provided EVP_PKEYs
ff3b59e 
This adds evp_keymgmt_util_copy() and affects EVP_PKEY_copy_parameters()

Reviewed-by: Shane Lontis <[email protected]>
(Merged from openssl#11158)
@levitte
PROV: Add a OP_keymgmt_match() function to our DH, DSA, RSA and EC_KE…
2888fc1 
…Y impl

Reviewed-by: Shane Lontis <[email protected]>
(Merged from openssl#11158)
@levitte levitte force-pushed the provider-key-check+cmp+dup-take3 branch from d191db4 to 2888fc1 Compare March 2, 2020 02:28
@openssl-machine openssl-machine merged commit 2888fc1 into openssl:master Mar 2, 2020
@slontis
Copy link
Member

slontis commented Mar 2, 2020

Woohoo (sense of relief that there is no take 4 that needs reviewing :) )

@levitte
Copy link
Member Author

levitte commented Mar 2, 2020

sense of relief that there is no take 4 that needs reviewing :)

Not to mention producing 😉

@levitte levitte deleted the provider-key-check+cmp+dup-take3 branch April 8, 2020 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@slontis slontis slontis approved these changes

@mattcaswell mattcaswell Awaiting requested review from mattcaswell

+1 more reviewer

@romen romen romen left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Applies to master branch

Projects

None yet

Milestone

3.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@levitte @slontis @openssl-machine @romen