Fix #8292: allow building curl when wolfssl configured with --enable-opensslextra #8315
Conversation
put all #include of openssl files behind wolfssl ifdefs so that we can use the wolfssl/ prefixed include paths. Without these curl only builds when wolfssl is built with enable-all.
I don't think this is exactly true (you just needed more options than what you used and you didn't test other combos than |
.github/workflows/wolfssl.yml
Outdated
| @@ -35,7 +35,7 @@ jobs: | |||
| tar -xzf v5.0.0-stable.tar.gz | |||
| cd wolfssl-5.0.0-stable | |||
| ./autogen.sh | |||
| ./configure --enable-tls13 --enable-all --enable-harden --prefix=$HOME/wssl | |||
| ./configure --enable-tls13 --enable-opensslextra --enable-harden --prefix=$HOME/wssl | |||
There was a problem hiding this comment.
I don't think you should remove the old --enable-all build but I think adding an --enable-opensslextra is a good ideas. Note that the second build is a lesser wolfSSL build and for example NTLM will not be enabled in your curl build using that.
There was a problem hiding this comment.
I have had a go at splitting the wolfssl CI job in two to test the two configurations.
Yep, good point. I guess the correct version of the statement is: this PR reduces the number of things you have to enable when configuring wolfssl in order to to build curl. |
|
Thanks! |
|
Thank you too! |
This MR puts all the
#includes of openssl files behind wolfssl#ifdefs so that we can use the wolfssl/ prefixed include paths.Without these curl only builds when wolfssl is built with enable-all. Running CI against the first commit should fail showing why the fix is useful.
fixes #8292