- Frank McGeough provided a small OpenSSL #include fix to make libcurl compile

  fine with Nokia 5th edition 1.0 SDK for Symbian.

diff --git a/CHANGES b/CHANGES
index 2271116332be79dca4713869092d05e27f1bdfd1..9e4bb8089891938b5f5375aff6b56102478cf013 100644 (file)
--- 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 58deec113befadb65025f579d7cf5c31a39b7be1..2d5f8d5f10aa0a7d2ea391f016e4e02b11875aee 100644 (file)
--- 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 a86c2808b51427e386595e4029661ac12c0f9473..6cb2c84621e136cfd8d6f8a13c0cdbdff655b6a7 100644 (file)
--- 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