diff options
| author | toddouska <todd@yassl.com> | 2011-12-27 12:17:37 -0800 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-02-14 19:49:54 +0100 |
| commit | ee7e4fc1d1d45713e9e67a955e78f0d9ed1a6059 (patch) | |
| tree | 876558e53eb54423b3da8a2d4bf504c4ccf5ba82 /lib | |
| parent | 020128053379ba5baa41bc2f72c391f6fcfbdf29 (diff) | |
cyassl: update to CyaSSL 2.0.x API
Modify configure.ac to test for new CyaSSL Init function and remove
default install path to system. Change to CyaSSL OpenSSL header and
proper Init in code as well.
Note that this no longer detects or works with CyaSSL before v2
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cyassl.c | 10 | ||||
| -rw-r--r-- | lib/urldata.h | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/lib/cyassl.c b/lib/cyassl.c index 31edcee06..e552e475a 100644 --- a/lib/cyassl.c +++ b/lib/cyassl.c @@ -404,14 +404,10 @@ size_t Curl_cyassl_version(char *buffer, size_t size) int Curl_cyassl_init(void) { -#if (LIBCYASSL_VERSION_HEX >= 0x02000000) - if(SSL_library_init() != SSL_SUCCESS) - return 0; -#else - InitCyaSSL(); -#endif + if(CyaSSL_Init() == 0) + return 1; - return 1; + return -1; } diff --git a/lib/urldata.h b/lib/urldata.h index 5725ba86b..0463006c6 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -112,7 +112,7 @@ #endif #ifdef USE_CYASSL -#include <openssl/ssl.h> +#include <cyassl/openssl/ssl.h> #endif #ifdef USE_NSS |