Skip to content

Comments

Move the handling of dso_scheme to dso_conf.h#5733

Closed
levitte wants to merge 4 commits intoopenssl:masterfrom
levitte:fix-DSO-20180323
Closed

Move the handling of dso_scheme to dso_conf.h#5733
levitte wants to merge 4 commits intoopenssl:masterfrom
levitte:fix-DSO-20180323

Conversation

@levitte
Copy link
Member

@levitte levitte commented Mar 23, 2018

The macros resulting from the dso_scheme attribute were defined for
libraries only, but there's a test program that uses the macros as
well. The easier way is to move the handling of this macro to
crypto/include/internal/dso_conf.h and having the modules that need it
include it.

The macros resulting from the dso_scheme attribute were defined for
libraries only, but there's a test program that uses the macros as
well.  The easier way is to move the handling of this macro to
crypto/include/internal/dso_conf.h and having the modules that need it
include it.
@levitte levitte added branch: master Applies to master branch branch: 1.1.1 Applies to OpenSSL_1_1_1-stable branch (EOL) labels Mar 23, 2018
levitte added 2 commits March 23, 2018 01:05
These errors were hidden because compiling this file didn't get the
macros derived from the dso_scheme attribute, and therefore, some code
never got compiled.
@levitte levitte changed the title WIP: Move the handling of dso_scheme to dso_conf.h Move the handling of dso_scheme to dso_conf.h Mar 23, 2018
levitte referenced this pull request Mar 23, 2018
When doing a regression test, it's obvious that the version
test/shlibloadtest is built for will not be the same as the library
version.  So we change the test to check for assumed compatibility.

Reviewed-by: Andy Polyakov <[email protected]>
(Merged from #5619)
@dot-asm
Copy link
Contributor

dot-asm commented Mar 23, 2018

appveryor failure is relevant.

myDSO_dsobyaddr and myDSO_free are only used in a narrow block of
code, and can therefore be made local to that block.  Otherwise, some
compilers may warn that they are unused.
@levitte
Copy link
Member Author

levitte commented Mar 23, 2018

I see why. New commit should clear that issue.

@dot-asm dot-asm added the approval: done This pull request has the required number of approvals label Mar 23, 2018
@levitte
Copy link
Member Author

levitte commented Mar 23, 2018

Merged.

84e68a1 test/shlibloadtest.c: make some variables block local
cfaad17 test/shlibloadtest.c: fix various errors
b71fa7b Include "internal/dso_conf.h" where needed and appropriate
c45bf27 Move the handling of dso_scheme to dso_conf.h

@levitte levitte closed this Mar 23, 2018
levitte added a commit that referenced this pull request Mar 23, 2018
The macros resulting from the dso_scheme attribute were defined for
libraries only, but there's a test program that uses the macros as
well.  The easier way is to move the handling of this macro to
crypto/include/internal/dso_conf.h and having the modules that need it
include it.

Reviewed-by: Andy Polyakov <[email protected]>
(Merged from #5733)
levitte added a commit that referenced this pull request Mar 23, 2018
levitte added a commit that referenced this pull request Mar 23, 2018
These errors were hidden because compiling this file didn't get the
macros derived from the dso_scheme attribute, and therefore, some code
never got compiled.

Reviewed-by: Andy Polyakov <[email protected]>
(Merged from #5733)
levitte added a commit that referenced this pull request Mar 23, 2018
myDSO_dsobyaddr and myDSO_free are only used in a narrow block of
code, and can therefore be made local to that block.  Otherwise, some
compilers may warn that they are unused.

Reviewed-by: Andy Polyakov <[email protected]>
(Merged from #5733)
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: master Applies to master branch branch: 1.1.1 Applies to OpenSSL_1_1_1-stable branch (EOL)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants