aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2009-05-27 21:11:11 +0000
committerDaniel Stenberg <daniel@haxx.se>2009-05-27 21:11:11 +0000
commitbf085e2c4b314a6cef38adfe6c9d84ea1b7fa0f3 (patch)
tree47400a34266247208c9db14b9140480e23dd1ee5
parentce1a97d6c80a9eb9eb146e0d4f5a37deb3e5d9d0 (diff)
- Frank McGeough provided a small OpenSSL #include fix to make libcurl compile
fine with Nokia 5th edition 1.0 SDK for Symbian.
-rw-r--r--CHANGES4
-rw-r--r--RELEASE-NOTES3
-rw-r--r--lib/ssluse.c3
3 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 227111633..9e4bb8089 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
Changelog
+Daniel Stenberg (27 May 2009)
+- Frank McGeough provided a small OpenSSL #include fix to make libcurl compile
+ fine with Nokia 5th edition 1.0 SDK for Symbian.
+
Daniel Stenberg (25 May 2009)
- bug report #2796358 (http://curl.haxx.se/bug/view.cgi?id=2796358) pointed
out that the cookie parser would leak memory when it parses cookies that are
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 58deec113..2d5f8d5f1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,6 +15,7 @@ This release includes the following bugfixes:
o crash on bad socket close with FTP
o leaking cookie memory when duplicate domains or paths were used
+ o build fix for Symbian
This release includes the following known bugs:
@@ -23,6 +24,6 @@ This release includes the following known bugs:
This release would not have looked like this without help, code, reports and
advice from friends like these:
- Kamil Dudka, Caolan McNamara
+ Kamil Dudka, Caolan McNamara, Frank McGeough
Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/ssluse.c b/lib/ssluse.c
index a86c2808b..6cb2c8462 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -63,6 +63,8 @@
#ifdef USE_OPENSSL
#include <openssl/rand.h>
#include <openssl/x509v3.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
#else
#include <rand.h>
#include <x509v3.h>
@@ -89,6 +91,7 @@
#if OPENSSL_VERSION_NUMBER >= 0x00907001L
/* ENGINE_load_private_key() takes four arguments */
#define HAVE_ENGINE_LOAD_FOUR_ARGS
+#include <openssl/ui.h>
#else
/* ENGINE_load_private_key() takes three arguments */
#undef HAVE_ENGINE_LOAD_FOUR_ARGS