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

LibreSSL doesn't define OPENSSL_VERSION, use LIBRESSL_VERSION_TEXT instead #7520

Merged
merged 1 commit into from Feb 12, 2016

Conversation

Projects
None yet
4 participants
@paveljanik
Contributor

paveljanik commented Feb 11, 2016

OpenBSD is using LibreSSL by default instead of openssl. The build ends with

CXX      libbitcoin_server_a-init.o
In file included from addrman.h:14:0,
                 from init.cpp:12:
init.cpp: In function 'bool AppInit2(boost::thread_group&, CScheduler&)':
init.cpp:1095:61: error: 'OPENSSL_VERSION' was not declared in this scope
     LogPrintf("Using OpenSSL version %s\n", OpenSSL_version(OPENSSL_VERSION));
                                                             ^

This change adds LIBRESSL_VERSION_TEXT macrocheck and adds conditionals before these macros. If none is defined, nothing is printed at all.

Fixes #7515.
Fixes #7447.

@luke-jr

This comment has been minimized.

Show comment
Hide comment
@luke-jr
Member

luke-jr commented Feb 12, 2016

utACK a0a17b3

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Feb 12, 2016

Member

utACK

Member

laanwj commented Feb 12, 2016

utACK

@laanwj laanwj merged commit a0a17b3 into bitcoin:master Feb 12, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Feb 12, 2016

Merge #7520: LibreSSL doesn't define OPENSSL_VERSION, use LIBRESSL_VE…
…RSION_TEXT instead

a0a17b3 LibreSSL doesn't define OPENSSL_VERSION, use LIBRESSL_VERSION_TEXT instead (Pavel Janík)

@laanwj laanwj removed the Needs backport label Sep 26, 2016

@laanwj laanwj added this to the 0.12.2 milestone Sep 26, 2016

@fanquake fanquake removed the Needs backport label Mar 7, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment