switch from CyaSSL to wolfSSL for crypto

pull/1/head
John Safranek 2015-01-13 09:39:48 -08:00
parent d83d9356d2
commit d7f1cb321c
3 changed files with 58 additions and 57 deletions

View File

@ -64,7 +64,7 @@ AC_CHECK_FUNCS([socket])
AC_CHECK_LIB(network,socket)
# Requirements
TAO_REQUIRE_LIBCYASSL
TAO_REQUIRE_LIBWOLFSSL
#REQUIRE_CYASSL([scep])
#REQUIRE_WOLFCRYPT([aes rsa dh])

View File

@ -1,56 +0,0 @@
#--------------------------------------------------------------------
# Check for libcyassl
#--------------------------------------------------------------------
AC_DEFUN([_TAO_SEARCH_LIBCYASSL],[
AC_REQUIRE([AC_LIB_PREFIX])
LIBS="$LIBS -lcyassl"
AC_LIB_HAVE_LINKFLAGS([cyassl], ,
[
#include <cyassl/ssl.h>
],[
CyaSSL_Init();
])
AM_CONDITIONAL(HAVE_LIBCYASSL, [test "x${ac_cv_libcyassl}" = "xyes"])
AS_IF([test "x${ac_cv_libcyassl}" = "xyes"],[
save_LIBS="${LIBS}"
LIBS="${LIBS} ${LTLIBCYASSL}"
AC_CHECK_FUNCS(CyaSSL_Cleanup)
LIBS="$save_LIBS"
])
])
AC_DEFUN([_TAO_HAVE_LIBCYASSL],[
AC_ARG_ENABLE([libcyassl],
[AS_HELP_STRING([--disable-libcyassl],
[Build with libcyassl support @<:@default=on@:>@])],
[ac_enable_libcyassl="$enableval"],
[ac_enable_libcyassl="yes"])
_TAO_SEARCH_LIBCYASSL
])
AC_DEFUN([TAO_HAVE_LIBCYASSL],[
AC_REQUIRE([_TAO_HAVE_LIBCYASSL])
])
AC_DEFUN([_TAO_REQUIRE_LIBCYASSL],[
ac_enable_libcyassl="yes"
_TAO_SEARCH_LIBCYASSL
AS_IF([test x$ac_cv_libcyassl = xno],[
AC_MSG_ERROR([libcyassl is required for ${PACKAGE}. It can be obtained from http://www.wolfssl.com/download.html/])
])
])
AC_DEFUN([TAO_REQUIRE_LIBCYASSL],[
AC_REQUIRE([_TAO_REQUIRE_LIBCYASSL])
])

57
m4/have_wolfssl.m4 100644
View File

@ -0,0 +1,57 @@
#--------------------------------------------------------------------
# Check for libwolfssl
#--------------------------------------------------------------------
AC_DEFUN([_TAO_SEARCH_LIBWOLFSSL],[
AC_REQUIRE([AC_LIB_PREFIX])
LDFLAGS="$LDFLAGS -L/usr/local/lib"
LIBS="$LIBS -lwolfssl"
AC_LIB_HAVE_LINKFLAGS(wolfssl,,
[
#include <wolfssl/ssl.h>
],[
wolfSSL_Init();
])
AM_CONDITIONAL(HAVE_LIBWOLFSSL, [test "x${ac_cv_libwolfssl}" = "xyes"])
AS_IF([test "x${ac_cv_libwolfssl}" = "xyes"],[
save_LIBS="${LIBS}"
LIBS="${LIBS} ${LTLIBWOLFSSL}"
AC_CHECK_FUNCS(wolfSSL_Cleanup)
LIBS="$save_LIBS"
])
])
AC_DEFUN([_TAO_HAVE_LIBWOLFSSL],[
AC_ARG_ENABLE([libwolfssl],
[AS_HELP_STRING([--disable-libwolfssl],
[Build with libwolfssl support @<:@default=on@:>@])],
[ac_enable_libwolfssl="$enableval"],
[ac_enable_libwolfssl="yes"])
_TAO_SEARCH_LIBWOLFSSL
])
AC_DEFUN([TAO_HAVE_LIBWOLFSSL],[
AC_REQUIRE([_TAO_HAVE_LIBWOLFSSL])
])
AC_DEFUN([_TAO_REQUIRE_LIBWOLFSSL],[
ac_enable_libwolfssl="yes"
_TAO_SEARCH_LIBWOLFSSL
AS_IF([test x$ac_cv_libwolfssl = xno],[
AC_MSG_ERROR([libwolfssl is required for ${PACKAGE}, It can be obtained from http://www.wolfssl.com/download.html/])
])
])
AC_DEFUN([TAO_REQUIRE_LIBWOLFSSL],[
AC_REQUIRE([_TAO_REQUIRE_LIBWOLFSSL])
])