Skip to content

Conversation

@mspncp
Copy link
Contributor

@mspncp 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 mattcaswell added branch: 1.0.2 Applies to OpenSSL_1_0_2-stable branch (EOL) approval: review pending This pull request needs review by a committer labels Dec 7, 2017
@mattcaswell
Copy link
Member

Travis failure is unrelated (see #4866)

@Jan-E
Copy link

Jan-E commented Dec 7, 2017

FWIW: this solved my issue in #4864

@levitte levitte 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 Dec 7, 2017
@Jan-E
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
Copy link
Contributor Author

mspncp commented Dec 7, 2017

Thanks for your effort, @Jan-E!

Fixes openssl#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 pr-add-missing-fips-prototype branch from 015e9c6 to 4a8e333 Compare December 7, 2017 23:38
@mspncp
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
Copy link
Member

Pushed. Thanks.

@mattcaswell mattcaswell closed this Dec 8, 2017
levitte pushed a commit that referenced this pull request Dec 8, 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>.

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 pr-add-missing-fips-prototype branch December 8, 2017 10:41
@Jan-E
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

Labels

approval: done This pull request has the required number of approvals branch: 1.0.2 Applies to OpenSSL_1_0_2-stable branch (EOL)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants