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.

Sign up for GitHub

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

Jump to bottom

Fix the effect of no-dso in crypto/init.c #1902

Closed
wants to merge 1 commit into from
Closed

Fix the effect of no-dso in crypto/init.c #1902

wants to merge 1 commit into from

Conversation

levitte
Copy link
Member

@levitte levitte commented Nov 11, 2016 •
edited

Checklist
  • CLA is signed
Description of change

When configured no-dso, there are no DSO_{whatever} macros defined.
Therefore, before checking those, you have to check if OPENSSL_NO_DSO
is defined.

Fixes #1899

@levitte
Fix the effect of no-dso in crypto/init.c
fdbe952 
When configured no-dso, there are no DSO_{whatever} macros defined.
Therefore, before checking those, you have to check if OPENSSL_NO_DSO
is defined.
@levitte levitte added the branch: master Merge to master branch label Nov 11, 2016
@levitte levitte mentioned this pull request Nov 11, 2016
Closed
mattcaswell
mattcaswell approved these changes Nov 11, 2016
View reviewed changes
Copy link
Member

@mattcaswell mattcaswell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this need the 1.1.0 label too? My approval counts for both.

@levitte levitte added the 1.1.0 label Nov 11, 2016
@levitte
Copy link
Member Author

levitte commented Nov 11, 2016

I forgot that this stuff made it to that branch as well... Label added

vszakats added a commit to curl/curl-for-win that referenced this pull request Nov 11, 2016
@vszakats
openssl.diff: patch for no-dso hang
1f11a4a 
from PR openssl/openssl#1902
levitte added a commit that referenced this pull request Nov 11, 2016
@levitte
Fix the effect of no-dso in crypto/init.c
6e290a2 
When configured no-dso, there are no DSO_{whatever} macros defined.
Therefore, before checking those, you have to check if OPENSSL_NO_DSO
is defined.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #1902)
levitte added a commit that referenced this pull request Nov 11, 2016
@levitte
Fix the effect of no-dso in crypto/init.c
1b8055a 
When configured no-dso, there are no DSO_{whatever} macros defined.
Therefore, before checking those, you have to check if OPENSSL_NO_DSO
is defined.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #1902)
(cherry picked from commit 6e290a2)
@levitte
Copy link
Member Author

levitte commented Nov 11, 2016

Merged into both

@levitte levitte closed this Nov 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattcaswell mattcaswell mattcaswell approved these changes

Assignees
No one assigned
Labels
branch: master Merge to master branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

openssl version command hangs with 1.1.0c and no-dso option
2 participants
@levitte @mattcaswell