Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EVP: Only use the engine when one is defined, in pkey_mac_ctrl() #11674

Closed
wants to merge 2 commits into from

Conversation

@levitte
Copy link
Member

@levitte levitte commented Apr 29, 2020

Fixes #11671

@levitte levitte added this to the 3.0.0 milestone Apr 29, 2020
@levitte levitte added this to In progress in 3.0 New Core + FIPS via automation Apr 29, 2020
3.0 New Core + FIPS automation moved this from In progress to Reviewer approved Apr 29, 2020
Copy link
Contributor

@slontis slontis left a comment

Oops

@levitte
Copy link
Member Author

@levitte levitte commented Apr 29, 2020

Oops

Yup

@mattcaswell
Copy link
Member

@mattcaswell mattcaswell commented Apr 29, 2020

Can we have a test (perhaps in evp_extra_test) for creating a CMAC key as per #11671?

@openssl-machine
Copy link

@openssl-machine openssl-machine commented Apr 30, 2020

24 hours has passed since 'approval: done' was set, but as this PR has been updated in that time the label 'approval: ready to merge' is not being automatically set. Please review the updates and set the label manually.

@levitte levitte force-pushed the levitte:fix-11671 branch May 12, 2020
@levitte
Copy link
Member Author

@levitte levitte commented May 12, 2020

I finally got around to add a quick test

@levitte levitte dismissed slontis’s stale review May 12, 2020

Re-approval needed

3.0 New Core + FIPS automation moved this from Reviewer approved to Needs review May 12, 2020
@levitte levitte force-pushed the levitte:fix-11671 branch to b36d615 May 13, 2020
@levitte
Copy link
Member Author

@levitte levitte commented May 13, 2020

Rebased to get rid of the mdl failure.

Copy link
Contributor

@slontis slontis left a comment

Provided the tests pass.

3.0 New Core + FIPS automation moved this from Needs review to Reviewer approved May 13, 2020
@openssl-machine
Copy link

@openssl-machine openssl-machine commented May 14, 2020

24 hours has passed since 'approval: done' was set, but this PR has failing CI tests. Once the tests pass it will get moved to 'approval: ready to merge' automatically, alternatively please review and set the label manually.

@levitte levitte removed this from Reviewer approved in 3.0 New Core + FIPS May 14, 2020
@levitte
Copy link
Member Author

@levitte levitte commented May 14, 2020

Merged

bcb018e EVP: Only use the engine when one is defined, in pkey_mac_ctrl()
a87820e test/evp_extra_test.c: Add test for CMAC keygen with a NULL engine

@levitte levitte closed this May 14, 2020
openssl-machine pushed a commit that referenced this pull request May 14, 2020
Fixes #11671

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from #11674)
openssl-machine pushed a commit that referenced this pull request May 14, 2020
Verifies that #11671 is fixed

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from #11674)
@levitte levitte deleted the levitte:fix-11671 branch May 14, 2020
@mattcaswell
Copy link
Member

@mattcaswell mattcaswell commented May 14, 2020

This seems to have broken Travis.

@levitte
Copy link
Member Author

@levitte levitte commented May 14, 2020

How the hell that happened...
Will look.

@levitte
Copy link
Member Author

@levitte levitte commented May 14, 2020

Fix in #11833

@anamulhkp
Copy link

@anamulhkp anamulhkp commented May 14, 2020

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

5 participants