diff options
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | docs/INTERNALS | 2 | ||||
| -rw-r--r-- | lib/cyassl.c | 10 | ||||
| -rw-r--r-- | lib/urldata.h | 2 |
4 files changed, 9 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 6dfb4dd40..631563dea 100644 --- a/configure.ac +++ b/configure.ac @@ -1957,7 +1957,7 @@ OPT_CYASSL=no _cppflags=$CPPFLAGS _ldflags=$LDFLAGS AC_ARG_WITH(cyassl,dnl -AC_HELP_STRING([--with-cyassl=PATH],[where to look for CyaSSL, PATH points to the installation root (default: /usr/local/cyassl)]) +AC_HELP_STRING([--with-cyassl=PATH],[where to look for CyaSSL, PATH points to the installation root (default: system lib default)]) AC_HELP_STRING([--without-cyassl], [disable CyaSSL detection]), OPT_CYASSL=$withval) @@ -1970,14 +1970,9 @@ if test "$OPENSSL_ENABLED" != "1"; then fi if test -z "$OPT_CYASSL" ; then - dnl check for lib in default first + dnl check for lib in system default first - trycyassldir="/usr/local/cyassl" - - LDFLAGS="$LDFLAGS -L$trycyassldir/lib" - CPPFLAGS="$CPPFLAGS -I$trycyassldir/include" - - AC_CHECK_LIB(cyassl, InitCyaSSL, + AC_CHECK_LIB(cyassl, CyaSSL_Init, dnl libcyassl found, set the variable [ AC_DEFINE(USE_CYASSL, 1, [if CyaSSL is enabled]) @@ -1999,7 +1994,7 @@ if test "$OPENSSL_ENABLED" != "1"; then CPPFLAGS="$CPPFLAGS $addcflags" fi - AC_CHECK_LIB(cyassl, InitCyaSSL, + AC_CHECK_LIB(cyassl, CyaSSL_Init, [ AC_DEFINE(USE_CYASSL, 1, [if CyaSSL is enabled]) AC_SUBST(USE_CYASSL, [1]) diff --git a/docs/INTERNALS b/docs/INTERNALS index f965ec516..39c4df720 100644 --- a/docs/INTERNALS +++ b/docs/INTERNALS @@ -39,7 +39,7 @@ Portability libssh2 0.16 c-ares 1.6.0 libidn 0.4.1 - cyassl 1.4.0 + cyassl 2.0.0 openldap 2.0 MIT krb5 lib 1.2.4 qsossl V5R2M0 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 |