-
-
Notifications
You must be signed in to change notification settings - Fork 10.1k
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 compensational definition for OPENSSL_MSTR in macros.h #10236
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would probably be a better idea to add them in includ/openssl/macros.h
and give them a more generic name (i.e the original names)
a878cd0
to
71cb60c
Compare
all right, done |
These two macros were two of the "newly added but undocumented" macros that got into the 3.0 codebase before we set doc-nits to start complaining about undocumented stuff. See #9095. f386632 co-incidentally fixed that by removing the macros - so this PR introduces it again. doc-nits doesn't complain because they weren't also removed form missingmacros.txt. But we should probably document these macros. |
No problem to add some documentation for these two macros, but where to do this? I would have put it wherever similar macros are documented, but also (most of) the other macros in |
Do these have to be public? |
Currently the two macros are used only in the public header On the other hand, the CCP string composition trick is a generally useful macro (and can be found online as C programming hint under various names). So we could also export it for the benefit of others. Which way do you prefer? |
Nah, if we use it publicaly, let's expose if publicaly. |
Fine, and where to document these macros? |
Since I got no response on where to document these two macros, |
Uhmmmm, this PR is suddenly a minor gazillion commits. What happened? |
c171f41
to
b85f0f8
Compare
Hmm, it looks like rebase went somewhat wrong. Fixed. |
Recent Travis CI hang resulted in false positive. This time it worked. |
Can someone please give a second approval on this and merge it soon? |
Merge happens (at the earliest) 24 hours after "approval: done" is reached. |
Thanks for the swift (re-)action! |
ping: ready to merge |
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from #10236)
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from #10236)
I pushed this. Note: I merged the last 2 commits into 1. |
The recent commit f386632 broke
include/opensll/cmp_util.h
when the trace API is enabled.This PR adds in that header file a compensational declaration.