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

Add missing prototype for FIPS callback #4870

Conversation

Projects
None yet
4 participants
@mspncp
Copy link
Contributor

mspncp commented Dec 7, 2017

Fixes #2533

The call to FIPS_crypto_set_id_callback() was added in revision a43cfd7, but there is no prototype for it in <openssl/fips.h>.

@mattcaswell

This comment has been minimized.

Copy link
Member

mattcaswell commented Dec 7, 2017

Travis failure is unrelated (see #4866)

@Jan-E

This comment has been minimized.

Copy link

Jan-E commented Dec 7, 2017

FWIW: this solved my issue in #4864

@levitte

levitte approved these changes Dec 7, 2017

@levitte levitte added ready and removed pending 2nd review labels Dec 7, 2017

@Jan-E

This comment has been minimized.

Copy link

Jan-E commented Dec 7, 2017

I have tested this patch for all combinations of VC-WIN32/VC-WIN64A, vc9/vc11/vc14/vc15 and dll's/static libs with OpenSSL-Fips-2.0.16. 'passed all tests' in all 16 instances.

@mspncp

This comment has been minimized.

Copy link
Contributor Author

mspncp commented Dec 7, 2017

Thanks for your effort, @Jan-E!

Add missing prototype for FIPS callback
Fixes #2533

The call to FIPS_crypto_set_id_callback() was added in revision a43cfd7,
but there is no prototype for it in <openssl/fips.h>.

Signed-off-by: Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>

@mspncp mspncp force-pushed the mspncp:pr-add-missing-fips-prototype branch from 015e9c6 to 4a8e333 Dec 7, 2017

@mspncp

This comment has been minimized.

Copy link
Contributor Author

mspncp commented Dec 7, 2017

Rebased without changes to fix the fatalerrtest and get some green lights from the build bots.

@mattcaswell

This comment has been minimized.

Copy link
Member

mattcaswell commented Dec 8, 2017

Pushed. Thanks.

@mattcaswell mattcaswell closed this Dec 8, 2017

levitte pushed a commit that referenced this pull request Dec 8, 2017

Add missing prototype for FIPS callback
Fixes #2533

The call to FIPS_crypto_set_id_callback() was added in revision a43cfd7,
but there is no prototype for it in <openssl/fips.h>.

Signed-off-by: Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #4870)

@mspncp mspncp deleted the mspncp:pr-add-missing-fips-prototype branch Dec 8, 2017

@Jan-E

This comment has been minimized.

Copy link

Jan-E commented Dec 8, 2017

Thanks for your effort, @Jan-E!

My pleasure. I gave all of you due credit:
https://www.apachelounge.com/viewtopic.php?p=36237#36237

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.