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.

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

Assume OpenSSL engine support in 0.9.8 or later #2983

Closed
rainerjung opened this issue Sep 12, 2018 · 2 comments
Closed

Assume OpenSSL engine support in 0.9.8 or later #2983

rainerjung opened this issue Sep 12, 2018 · 2 comments
Labels
TLS

Comments

@rainerjung
Copy link
Contributor

Commit d6417f6 added inclusion of engine.h when OpenSSL is of version 1.0.0 or newer. That's good, but the conservative approach t limit the fix to OpenSSL >= 1.0.0 isn't correct. ENGINE_cleanup() and other needed symbols, which get used to HAVE-checks and need engine.h were already introduced at least in 0.9.8. I tried building curl 7.61.1 against OpenSSL 0.9.8 for testing with some old setup and building curl fails.

The following will fix it at least for 0.9.8. I have not tested with 0.9.7, so will rstrict the fix to 0.9.8. Patch:

--- lib/vtls/openssl.c 2018-09-04 22:46:08.000000000 +0200
+++ lib/vtls/openssl.c 2018-09-12 13:25:38.298075000 +0200
@@ -69,7 +69,7 @@
 #include <openssl/ocsp.h>
 #endif

-#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) && /* 1.0.0 or later */     \
+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && /* 1.0.0 or later */     \
   !defined(OPENSSL_NO_ENGINE)
 #define USE_OPENSSL_ENGINE
 #include <openssl/engine.h>
@bagder bagder added the TLS label Sep 13, 2018
@bagder
Copy link
Member

bagder commented Sep 13, 2018

I figure the comment needs an update too!

bagder pushed a commit that referenced this issue Sep 13, 2018
@rainerjung @bagder
openssl: assume engine support in 0.9.8 or later
3cc7c62 
Fixes #2983
@bagder bagder mentioned this issue Sep 13, 2018
Closed
@bagder
Copy link
Member

bagder commented Sep 13, 2018

I turned it into a PR (with you as author).

@bagder bagder closed this as completed in 1599dfc Sep 14, 2018
@mkauf mkauf mentioned this issue Nov 13, 2018
Closed
@lock lock bot locked as resolved and limited conversation to collaborators Dec 13, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
TLS
Milestone
No milestone
Development

No branches or pull requests
2 participants
@bagder @rainerjung