Skip to content

Comments

Run sslapi test with the FIPS module#11508

Closed
mattcaswell wants to merge 8 commits intoopenssl:masterfrom
mattcaswell:run-sslapi-in-fips
Closed

Run sslapi test with the FIPS module#11508
mattcaswell wants to merge 8 commits intoopenssl:masterfrom
mattcaswell:run-sslapi-in-fips

Conversation

@mattcaswell
Copy link
Member

We run sslapitest twice: Once with a non-default library context with the default provider loaded into it, and once with a non-default library context with the FIPS provider loaded into it. In both cases we load the "null" provider into the default context to make sure we don't accidentally pick up algorithms from there.

This will fail when running the sslapitest since it requires all the key gen PRs to be merged first (and I have not included them here). However, aside from the dependencies this should be fairly complete and can be reviewed.

@mattcaswell mattcaswell added branch: master Applies to master branch approval: review pending This pull request needs review by a committer labels Apr 9, 2020
@mattcaswell
Copy link
Member Author

Fixup pushed containing some code that I had locally but somehow managed to miss including in this PR

This was referenced Apr 10, 2020
@levitte
Copy link
Member

levitte commented Apr 16, 2020

You might want to edit the subject, as #11328, #11303, and #11332 are now merged

@mattcaswell mattcaswell changed the title [WIP, pending on #11328, #11303, #11332, #11371]: Run sslapi test with the FIPS module [WIP, pending on #11371]: Run sslapi test with the FIPS module Apr 16, 2020
@mattcaswell
Copy link
Member Author

You might want to edit the subject, as #11328, #11303, and #11332 are now merged

Done

@mattcaswell
Copy link
Member Author

Updated to address comments above.

Copy link
Contributor

@paulidale paulidale left a comment

Choose a reason for hiding this comment

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

LGTM, approved after #11371 is merged if CIs still pass.

@paulidale paulidale 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 Apr 17, 2020
@slontis slontis closed this Apr 17, 2020
@slontis slontis reopened this Apr 17, 2020
There were a few places where we were not passing through the libctx
when constructing and EVP_PKEY_CTX.
@mattcaswell mattcaswell changed the title [WIP, pending on #11371]: Run sslapi test with the FIPS module Run sslapi test with the FIPS module Apr 17, 2020
@mattcaswell
Copy link
Member Author

I've rebased this now that #11371 has gone in and taken it out of WIP. I also had to add an additional commit to fixup llibssl a little bit. That commit was included in #11520, but hadn't been included here.

Please take a look!

@mattcaswell
Copy link
Member Author

Fixup pushed addressing the comment from @levitte above.

@slontis
Copy link
Member

slontis commented Apr 18, 2020

I have added a change to skip the fips tests if "fips" is disabled.

@openssl-machine
Copy link
Collaborator

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.

Copy link
Contributor

@paulidale paulidale left a comment

Choose a reason for hiding this comment

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

I can't formally approve @slontis's last commit. My approval stands for everything else.

As for resetting the timer, I'm unsure.

"passwd.txt"), $tmpfilename, "fips",
srctop_file("test", "fips.cnf")])),
"running sslapitest");
unless ($no_fips) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Would a SKIP block here be more sensible? It avoids computing the number of tests in the plan.

Copy link
Member

Choose a reason for hiding this comment

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

we do it this way in quite a few other places..

Copy link
Member

Choose a reason for hiding this comment

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

As for resetting the timer, I'm unsure.

I dont think it needs to restart - all that got changed is that a test that is not supposed to run doesnt run now.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm fine either way, there isn't a lot of different.

@mattcaswell
Copy link
Member Author

I have added a change to skip the fips tests if "fips" is disabled.

This is fixing up the wrong commit - but that can be addressed during merge

@mattcaswell
Copy link
Member Author

Apparently the github UI won't let me approve my own PR. But anyway for the record I approve Shane's last commit - and will sort out during the push to make sure it fixes up the correct commit.

@mattcaswell
Copy link
Member Author

Pushed! Thanks.

openssl-machine pushed a commit that referenced this pull request Apr 19, 2020
We also don't load the default provider into the default libctx to make
sure there is no accidental "leakage".

Reviewed-by: Paul Dale <[email protected]>
(Merged from #11508)
openssl-machine pushed a commit that referenced this pull request Apr 19, 2020
Reviewed-by: Paul Dale <[email protected]>
(Merged from #11508)
openssl-machine pushed a commit that referenced this pull request Apr 19, 2020
There were a few places where we were not passing through the libctx
when constructing and EVP_PKEY_CTX.

Reviewed-by: Paul Dale <[email protected]>
(Merged from #11508)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval: done This pull request has the required number of approvals branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants