Skip to content

Small STORE registry fixes#3805

Closed
levitte wants to merge 2 commits intoopenssl:masterfrom
levitte:fix-store-20170629
Closed

Small STORE registry fixes#3805
levitte wants to merge 2 commits intoopenssl:masterfrom
levitte:fix-store-20170629

Conversation

@levitte
Copy link
Member

@levitte levitte commented Jun 29, 2017

See commit messages for details

We have already made sure that the loader scheme isn't NULL, so
checking if they are NULL or not when comparing registered loaders
is redundant.  We still soft assert it, just to be entirely sure.
Copy link
Contributor

@kaduk kaduk left a comment

Choose a reason for hiding this comment

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

Looks good, but do you need to make update to get the OSSL_STORE_R_LOADER_INCOMPLETE symbol picked up?

Most of the loader function pointers are crucial, they must be defined
unconditionally.  Therefore, let's make sure OSSL_STORE_register_loader
refuses to register incomplete loaders
@levitte levitte force-pushed the fix-store-20170629 branch from 5db8543 to b411c7f Compare June 29, 2017 20:11
@levitte
Copy link
Member Author

levitte commented Jun 29, 2017

Looks good, but do you need to make update to get the OSSL_STORE_R_LOADER_INCOMPLETE symbol picked up?

Thanks for the reminder. Done!

Copy link
Contributor

@kaduk kaduk left a comment

Choose a reason for hiding this comment

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

Thanks!

@levitte
Copy link
Member Author

levitte commented Jun 29, 2017

Merged. 6f9c506 and 5ee4074

@levitte levitte closed this Jun 29, 2017
levitte added a commit that referenced this pull request Jun 29, 2017
We have already made sure that the loader scheme isn't NULL, so
checking if they are NULL or not when comparing registered loaders
is redundant.  We still soft assert it, just to be entirely sure.

Reviewed-by: Ben Kaduk <[email protected]>
(Merged from #3805)
levitte added a commit that referenced this pull request Jun 29, 2017
Most of the loader function pointers are crucial, they must be defined
unconditionally.  Therefore, let's make sure OSSL_STORE_register_loader
refuses to register incomplete loaders

Reviewed-by: Ben Kaduk <[email protected]>
(Merged from #3805)
@levitte
Copy link
Member Author

levitte commented Jun 29, 2017

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants