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 compatibility for OpenSSL 1.1.0 pre5 and previous versions #460
Conversation
Add some checks to know which OpenSSL version is used, to be sure the code follows the syntax of the version used (including 1.1.0).
Need to change tests to pass
|
When openssl is configured as a static library (
This error does not occur with OpenSSL 1.0.2g. OpenSSL config line used:
|
Note also that OpenSSL 1.1 now uses libpthread by default, so you need to specify
So in places where we build static OpenSSL (RPM, OS X) we should either add the |
@dmiller-nmap , I've just run a If I configure openssl 1.1 with the same config line, it results in a similar but not identical output:
In
AC_CHECK_FUNC(EVP_sha256,, AC_MSG_ERROR([Your version of OpenSSL does not support SHA-256. Please install OpenSSL 0.9.8 or later.]))
I am suspecting that this check does not work anymore on OpenSSL 1.1, what do you think @dmiller-nmap ? |
This is all good except for merge conflicts. There are two:
Once these conflicts are solved, please merge this and make a note in the CHANGELOG that OpenSSL 1.1 is supported. |
@@ -574,7 +684,13 @@ static const struct luaL_Reg openssllib[] = { | |||
LUALIB_API int luaopen_openssl(lua_State *L) { | |||
|
|||
OpenSSL_add_all_algorithms(); | |||
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
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.
I just mixed them up here. I am currently making the commit to the SVN trunk, so this change and the merge issues will be corrected in it. I'll make an announcement in the CHANGELOG right after and write the revision number in the conversation of this PR.
This PR has been successfully sent and merged with the SVN trunk. The revision holding the modifications is revision 36063. Revision 36064 holds the CHANGELOG entry saying that OpenSLL 1.1.0-pre5 is now supported by Nmap. Cheers, |
Add some checks to know which OpenSSL version is used, to be sure the code follows the syntax of the version used (including and until OpenSSL version 1.1.0-pre5).
This is an update of PR #448, aiming to fix issue #439, which is now working like a charm :)
Waiting for review!