Basic support for OpenSSL 1.1.x on windows #1322

Closed
wants to merge 2 commits into
from

Projects

None yet

4 participants

@weltling
Contributor

As pointed out in #1201 already, the OpenSSL 1.1.x lib names have changed, which as consequence makes impossible to link cURL with OpenSSL > 1.0.2. While the aforementioned PR suggested to make lib names configurable, it were also dicussed to first care about the build process present currently. This PR goes for this, the library names are determined by checking the physical existence of the certain files. The newer OpenSSL libs are preferred, while in general there's no change to the current build approach. The only condition is, that the DEVEL dir has to contain either one or the other set of libs, not both at once.

@weltling weltling basic support for OpenSSL 1.1.x on windows
ca94c57

@weltling, thanks for your PR! By analyzing the history of the files in this pull request, we identified @yangtse, @mback2k and @msnelling to be potential reviewers.

winbuild/MakefileBuild.vc
USE_SSL = true
SSL = dll
!ELSEIF "$(WITH_SSL)"=="static"
+!IF EXISTS("$(DEVEL_LIB)\libssl.lib")
+SSL_LIBS = libssl.lib libcrypto.lib ws2_32.lib crypt32.lib gdi32.lib user32.lib crypt32.lib
jay
jay Mar 10, 2017 Owner

crypt32.lib is twice and also why ws2_32, is that needed?

weltling
weltling Mar 10, 2017 Contributor

Indeed, my typo. Too much of makefiles today :) I was basically refering to https://github.com/openssl/openssl/blob/master/NOTES.WIN#L114, but i see now the ws2_32 and advapi32 are added with WIN_LIBS, so we should be all fine with accordance to the doc.

@weltling weltling don't add libs twice
367868a

FWIW, I just pulled this down and did a build - changed my build to not do anything special for OpenSSL and it worked a treat.

@jay jay added a commit that closed this pull request Mar 13, 2017
@weltling @jay weltling + jay winbuild: add basic support for OpenSSL 1.1.x
- Auto-detect OpenSSL 1.1 libs

Closes #1322
db87bcf
@jay jay closed this in db87bcf Mar 13, 2017
Owner
jay commented Mar 13, 2017

Thanks guys

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