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

Remove the cast from the definition of OPENSSL_VERSION_NUMBER #7839

Closed
wants to merge 2 commits into from

Conversation

Projects
None yet
4 participants
@mattcaswell
Copy link
Member

mattcaswell commented Dec 6, 2018

If a cast is included in the definition it cannot be used in preprocessor
expressions, e.g. "#if OPENSSL_VERSION_NUMBER > 0x10000000L"

[extended tests]

Checklist
  • documentation is added or updated
  • tests are added or updated
@levitte

This comment has been minimized.

Copy link
Member

levitte commented Dec 6, 2018

I'm not sure why you're doing an extended test... We aren't using it.

@levitte

levitte approved these changes Dec 6, 2018

@mattcaswell

This comment has been minimized.

Copy link
Member Author

mattcaswell commented Dec 6, 2018

Because the krb5 external test is using it - and its failing.

@levitte

This comment has been minimized.

Copy link
Member

levitte commented Dec 6, 2018

Oh!

@mattcaswell

This comment has been minimized.

Copy link
Member Author

mattcaswell commented Dec 6, 2018

Travis was still not happy due to a different issue in the pyca external tests. @levitte - please can you take another look.

Show resolved Hide resolved include/openssl/opensslconf.h.in Outdated
Show resolved Hide resolved include/openssl/opensslconf.h.in Outdated
Show resolved Hide resolved include/openssl/opensslconf.h.in Outdated
Show resolved Hide resolved include/openssl/opensslconf.h.in Outdated
Show resolved Hide resolved include/openssl/opensslconf.h.in Outdated
Show resolved Hide resolved include/openssl/opensslconf.h.in Outdated
Show resolved Hide resolved include/openssl/opensslconf.h.in Outdated
@richsalz

This comment has been minimized.

Copy link
Contributor

richsalz commented Dec 6, 2018

The reason for not having the "# define" space is that this header file is not wrapped in the regular ifndef guard. Should I do that? Note that the API stuff at the end of the file would then also need indenting. Let me know.

@levitte

This comment has been minimized.

Copy link
Member

levitte commented Dec 6, 2018

Uhmmmmmm, @richsalz, I think your confusing different PRs

@richsalz

This comment has been minimized.

Copy link
Contributor

richsalz commented Dec 6, 2018

oh geez, time for a nap.

@mspncp
Copy link
Contributor

mspncp left a comment

Typo defintion is not only in pr title, but also in commit message.

Remove the cast from the definition of OPENSSL_VERSION_NUMBER
If a cast is included in the definition it cannot be used in preprocessor
expressions, e.g. "#if OPENSSL_VERSION_NUMBER > 0x10000000L"

[extended tests]

@mattcaswell mattcaswell changed the title Remove the cast from the defintion of OPENSSL_VERSION_NUMBER Remove the cast from the definition of OPENSSL_VERSION_NUMBER Dec 7, 2018

Only include opensslconf.h once
Fixes a pyca cryptography test failure.

[extended tests]

@mattcaswell mattcaswell force-pushed the mattcaswell:remove-cast branch from cbf9d31 to 95134d6 Dec 7, 2018

@mattcaswell

This comment has been minimized.

Copy link
Member Author

mattcaswell commented Dec 7, 2018

Sorry. I seem to have temporarily disconnected my brain while creating this PR. Review comments addressed. I force pushed in order to fix the typo in the commit message pointed out by @mspncp.

@levitte

levitte approved these changes Dec 7, 2018

@mattcaswell

This comment has been minimized.

Copy link
Member Author

mattcaswell commented Dec 7, 2018

Pushed. Thanks.

@mattcaswell mattcaswell closed this Dec 7, 2018

levitte pushed a commit that referenced this pull request Dec 7, 2018

Remove the cast from the definition of OPENSSL_VERSION_NUMBER
If a cast is included in the definition it cannot be used in preprocessor
expressions, e.g. "#if OPENSSL_VERSION_NUMBER > 0x10000000L"

[extended tests]

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #7839)

levitte pushed a commit that referenced this pull request Dec 7, 2018

Only include opensslconf.h once
Fixes a pyca cryptography test failure.

[extended tests]

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #7839)
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.