diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | lib/config-symbian.h | 12 | ||||
| -rw-r--r-- | packages/Symbian/group/libcurl.mmp | 10 | ||||
| -rw-r--r-- | packages/Symbian/readme.txt | 16 |
4 files changed, 23 insertions, 19 deletions
@@ -6,6 +6,10 @@ Changelog +Daniel Fandrich (11 Apr 2009) +- Added new libcurl source files to Symbian OS build files. +- Improved Symbian support for SSL. + Yang Tse (10 Apr 2009) - Daniel Johnson improved the MacOSX-Framework shell script to now perform all the steps required to build a Mac OS X four way fat ppc/i386/ppc64/x86_64 diff --git a/lib/config-symbian.h b/lib/config-symbian.h index 5f8296add..de5fd851d 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -745,12 +745,6 @@ /* if NSS is enabled */ /* #undef USE_NSS */ -/* if OpenSSL is in use */ -/*#define USE_OPENSSL 1*/ - -/* if SSL is enabled */ -/*#define USE_SSLEAY 1*/ - /* to enable SSPI support */ /* #undef USE_WINDOWS_SSPI */ @@ -817,7 +811,7 @@ #endif /* Enable appropriate definitions only when OpenSSL support is enabled */ -#ifdef USE_SSL -#define USE_OPENSSL 1 -#define USE_SSLEAY 1 +#ifdef USE_SSLEAY +/* if OpenSSL is in use */ +#define USE_OPENSSL #endif diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index 10357b9ec..356106bb4 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -2,7 +2,7 @@ // libcurl.dll cURL network retrieval client library // -// Build-time options +// Build-time options (uncomment these to enable) //#define ENABLE_ZLIB // Enable gzip/deflate decompression //#define ENABLE_SSL // Enable SSL for HTTPS/FTPS (requires S60 Open C SDK) @@ -16,7 +16,7 @@ MACRO BUILDING_LIBCURL MACRO HAVE_LIBZ #endif #ifdef ENABLE_SSL -MACRO USE_SSL +MACRO USE_SSLEAY #endif SOURCEPATH ../../../lib @@ -30,9 +30,13 @@ SOURCE \ http_negotiate.c http_ntlm.c inet_pton.c strtoofft.c strerror.c \ hostares.c hostasyn.c hostip4.c hostip6.c hostsyn.c hostthre.c \ inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c \ - strdup.c socks.c ssh.c nss.c qssl.c rawstr.c curl_addrinfo.c + strdup.c socks.c ssh.c nss.c qssl.c rawstr.c curl_addrinfo.c \ + socks_gssapi.c socks_sspi.c curl_sspi.c slist.c USERINCLUDE ../../../lib ../../../include/curl +#ifdef ENABLE_SSL +USERINCLUDE /epoc32/include/stdapis/openssl +#endif SYSTEMINCLUDE ../../../include /epoc32/include/stdapis /epoc32/include diff --git a/packages/Symbian/readme.txt b/packages/Symbian/readme.txt index cdd9f7450..840447b5d 100644 --- a/packages/Symbian/readme.txt +++ b/packages/Symbian/readme.txt @@ -70,13 +70,15 @@ half an hour are selected. LDAP, SCP or SFTP methods are not supported. -gzip and deflate decompression is supported when enabled in the libcurl.mmp -file. +gzip and deflate decompression is supported when the appropriate macro +is uncommented in the libcurl.mmp file. -SSL/TLS encryption is not supported by default, but it has been reported -to be made working with macros similar to the ones in config-symbian.h -and libcurl.mmp. This requires the OpenSSL libraries included in the S60 -Open C SDK. +SSL/TLS encryption is not enabled by default, but it is possible to add +when the OpenSSL libraries included in the S60 Open C SDK are available. +The appropriate macro in the libcurl.mmp file must be uncommented to +enable support. In addition, some manual editing of the libcurl source +code must also be done since the S60 port of OpenSSL disables support +for some encryption methods that libcurl assumes are always available. Debug builds are not supported (i.e. --enable-debug) because they cause additional symbol exports in the library which are not frozen in the .def @@ -85,4 +87,4 @@ files. Dan Fandrich dan@coneharvesters.com -October 2008 +April 2009 |