Change CyaSSL to wolfSSL

CyaSSL was renamed to wolfSSL. There's no good reason to use CyaSSL
anymore, and there are a lot of reasons not to, mostly owing to out of
date cryptography. So we won't be maintaining backward compatibility
with CyaSSL.

This closes #86

bin/include.am

@@ -29,9 +29,9 @@ bin_gearadmin_LDADD+= @BOOST_PROGRAM_OPTIONS_LIB@
 bin_gearadmin_LDFLAGS=
 
 if ENABLE_SSL
-if ENABLE_CYASSL
-bin_gearadmin_LDADD+= @CYASSL_LIB@
-bin_gearadmin_LDFLAGS+= @CYASSL_LDFLAGS@
+if ENABLE_WOLFSSL
+bin_gearadmin_LDADD+= @WOLFSSL_LIB@
+bin_gearadmin_LDFLAGS+= @WOLFSSL_LDFLAGS@
 else
 if ENABLE_OPENSSL
 bin_gearadmin_LDADD+= @OPENSSL_LIBS@

configure.ac

@@ -252,9 +252,9 @@ AX_CHECK_OPENSSL([have_openssl=yes
                   [have_openssl=no]) 
 AM_CONDITIONAL([ENABLE_OPENSSL],[test "x${have_openssl}" = "xyes"])
 
-# Check for CyaSSL
-AX_CHECK_CYASSL([have_cyassl=yes],[have_cyassl=no]) 
-AM_CONDITIONAL([ENABLE_CYASSL],[test "x${have_cyassl}" = "xyes"])
+# Check for wolfSSL
+AX_CHECK_WOLFSSL([have_wolfssl=yes],[have_wolfssl=no]) 
+AM_CONDITIONAL([ENABLE_WOLFSSL],[test "x${have_wolfssl}" = "xyes"])
 
 AC_DEFUN([AX_ENABLE_SSL],
          [AC_PREREQ([2.63])dnl
@@ -269,7 +269,7 @@ AC_DEFUN([AX_ENABLE_SSL],
                                         ],
                                         [enable_ssl=]_SSL_ENABLE_DEFAULT)
          AS_IF([test "x${enable_ssl}" = "xyes"],
-               [AS_IF([test "x${have_cyassl}" = "xyes"],
+               [AS_IF([test "x${have_wolfssl}" = "xyes"],
                       [AC_DEFINE([HAVE_SSL],[1],[Enable SSL Support])
                         AC_DEFINE([HAVE_OPENSSL],[0],[Enable OPENSSL Support])
                       ],
@@ -283,8 +283,8 @@ AC_DEFUN([AX_ENABLE_SSL],
          ])
 
 if [ test "x${enable_ssl}" = "xyes" ]; then
-  if ! [ test "x${have_openssl}" = "xyes" ] &&  ! [ test "x${have_cyassl}" = "xyes" ]; then
-    AC_MSG_ERROR([Unable to find either openssl or cyassl])
+  if ! [ test "x${have_openssl}" = "xyes" ] &&  ! [ test "x${have_wolfssl}" = "xyes" ]; then
+    AC_MSG_ERROR([Unable to find either openssl or wolfssl])
   fi
 fi
 
@@ -362,7 +362,7 @@ echo "   * Building with libpq        $ac_cv_libpq"
 echo "   * Building with tokyocabinet $ac_enable_libtokyocabinet"
 echo "   * Building with libmysql     $found_mysql"
 echo "   * SSL enabled:               $enable_ssl"
-echo "   * cyassl found:              $have_cyassl"
+echo "   * wolfssl found:             $have_wolfssl"
 echo "   * openssl found:             $have_openssl"
 echo "   * make -j:                   $enable_jobserver"
 echo "   * VCS checkout:              $ac_cv_vcs_checkout"

libgearman-server/include.am

@@ -95,9 +95,9 @@ libgearman_server_libgearman_server_la_LIBADD+= @LIBM@
 libgearman_server_libgearman_server_la_LIBADD+= @lt_cv_dlopen_libs@
 libgearman_server_libgearman_server_la_LIBADD+= @RT_LIB@
 if ENABLE_SSL
-if ENABLE_CYASSL
-libgearman_server_libgearman_server_la_LIBADD+= @CYASSL_LIB@
-libgearman_server_libgearman_server_la_LDFLAGS+= @CYASSL_LDFLAGS@
+if ENABLE_WOLFSSL
+libgearman_server_libgearman_server_la_LIBADD+= @WOLFSSL_LIB@
+libgearman_server_libgearman_server_la_LDFLAGS+= @WOLFSSL_LDFLAGS@
 else
 if ENABLE_OPENSSL
 libgearman_server_libgearman_server_la_LIBADD+= @OPENSSL_LIBS@

libgearman-server/io.cc

@@ -123,8 +123,8 @@ static size_t _connection_read(gearman_server_con_st *con, void *data, size_t da
 #if defined(HAVE_SSL) && HAVE_SSL
     if (con->_ssl)
     {
-# if defined(HAVE_CYASSL) && HAVE_CYASSL
-      read_size= CyaSSL_recv(con->_ssl, data, int(data_size), MSG_DONTWAIT);
+# if defined(HAVE_WOLFSSL) && HAVE_WOLFSSL
+      read_size= wolfSSL_recv(con->_ssl, data, int(data_size), MSG_DONTWAIT);
 # else
       read_size= SSL_read(con->_ssl, data, int(data_size));
 # endif
@@ -301,8 +301,8 @@ static gearmand_error_t _connection_flush(gearman_server_con_st *con)
 #if defined(HAVE_SSL) && HAVE_SSL
         if (con->_ssl)
         {
-#if defined(HAVE_CYASSL) && HAVE_CYASSL
-          write_size= CyaSSL_send(con->_ssl, connection->send_buffer_ptr, int(connection->send_buffer_size), MSG_NOSIGNAL|MSG_DONTWAIT);
+#if defined(HAVE_WOLFSSL) && HAVE_WOLFSSL
+          write_size= wolfSSL_send(con->_ssl, connection->send_buffer_ptr, int(connection->send_buffer_size), MSG_NOSIGNAL|MSG_DONTWAIT);
 #elif defined(HAVE_OPENSSL) && HAVE_OPENSSL
           write_size= SSL_write(con->_ssl, connection->send_buffer_ptr, int(connection->send_buffer_size));
 #endif

libgearman-server/plugins/protocol/gear/protocol.cc

@@ -374,8 +374,8 @@ static gearmand_error_t _gear_con_add(gearman_server_con_st *connection)
     int accept_error;
     while ((accept_error= SSL_accept(connection->_ssl)) != SSL_SUCCESS)
     {
-      int cyassl_error;
-      switch (cyassl_error= SSL_get_error(connection->_ssl, accept_error))
+      int wolfssl_error;
+      switch (wolfssl_error= SSL_get_error(connection->_ssl, accept_error))
       {
         case SSL_ERROR_NONE:
           break;
@@ -393,10 +393,10 @@ static gearmand_error_t _gear_con_add(gearman_server_con_st *connection)
         case SSL_ERROR_SSL:
         case SSL_ERROR_ZERO_RETURN:
         default:
-          char cyassl_error_buffer[SSL_ERROR_SIZE]= { 0 };
-          ERR_error_string_n(cyassl_error, cyassl_error_buffer, sizeof(cyassl_error_buffer));
+          char wolfssl_error_buffer[SSL_ERROR_SIZE]= { 0 };
+          ERR_error_string_n(wolfssl_error, wolfssl_error_buffer, sizeof(wolfssl_error_buffer));
           return gearmand_log_gerror(GEARMAN_DEFAULT_LOG_PARAM, GEARMAND_LOST_CONNECTION, "%s(%d)", 
-                                     cyassl_error_buffer, cyassl_error);
+                                     wolfssl_error_buffer, wolfssl_error);
       }
     }
     gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, "GearSSL connection made: %s:%s", connection->host(), connection->port());

libgearman/connection.cc

@@ -668,7 +668,7 @@ gearman_return_t gearman_connection_st::enable_ssl()
     if (_ssl == NULL)
     {
       close_socket();
-      return gearman_error(universal, GEARMAN_COULD_NOT_CONNECT, "CyaSSL_new() failed to return a valid object");
+      return gearman_error(universal, GEARMAN_COULD_NOT_CONNECT, "wolfSSL_new() failed to return a valid object");
     }
 
     if (SSL_set_fd(_ssl, fd) != SSL_SUCCESS)
@@ -823,8 +823,8 @@ gearman_return_t gearman_connection_st::flush()
 #if defined(HAVE_SSL) && HAVE_SSL
         if (_ssl)
         {
-#if defined(HAVE_CYASSL) && HAVE_CYASSL
-          write_size= CyaSSL_send(_ssl, send_buffer_ptr, int(send_buffer_size), MSG_NOSIGNAL);
+#if defined(HAVE_WOLFSSL) && HAVE_WOLFSSL
+          write_size= wolfSSL_send(_ssl, send_buffer_ptr, int(send_buffer_size), MSG_NOSIGNAL);
 #elif defined(HAVE_OPENSSL) && HAVE_OPENSSL
           write_size= SSL_write(_ssl, send_buffer_ptr, int(send_buffer_size));
 #endif
@@ -1129,8 +1129,8 @@ size_t gearman_connection_st::recv_socket(void *data, size_t data_size, gearman_
 #if defined(HAVE_SSL) && HAVE_SSL
     if (_ssl)
     {
-# if defined(HAVE_CYASSL) && HAVE_CYASSL
-      read_size= CyaSSL_recv(_ssl, data, int(data_size), MSG_NOSIGNAL);
+# if defined(HAVE_WOLFSSL) && HAVE_WOLFSSL
+      read_size= wolfSSL_recv(_ssl, data, int(data_size), MSG_NOSIGNAL);
 # elif defined(HAVE_OPENSSL) && HAVE_OPENSSL
       read_size= SSL_read(_ssl, data, int(data_size));
 # endif

libgearman/include.am

@@ -142,9 +142,9 @@ libgearman_libgearman_la_CXXFLAGS+= -DBUILDING_LIBGEARMAN
 libgearman_libgearman_la_LDFLAGS+= -version-info $(GEARMAN_LIBRARY_VERSION)
 
 if ENABLE_SSL
-if ENABLE_CYASSL
-libgearman_libgearman_la_LIBADD+= @CYASSL_LIB@
-libgearman_libgearman_la_LDFLAGS+= @CYASSL_LDFLAGS@
+if ENABLE_WOLFSSL
+libgearman_libgearman_la_LIBADD+= @WOLFSSL_LIB@
+libgearman_libgearman_la_LDFLAGS+= @WOLFSSL_LDFLAGS@
 else
 if ENABLE_OPENSSL
 libgearman_libgearman_la_LIBADD+= @OPENSSL_LIBS@

libgearman/ssl.h

@@ -41,9 +41,9 @@
 
 # define SSL_ERROR_SIZE 120
 
-# if defined(HAVE_CYASSL) && HAVE_CYASSL
-#  include <cyassl/ssl.h>
-#  include <cyassl/openssl/ssl.h>
+# if defined(HAVE_WOLFSSL) && HAVE_WOLFSSL
+#  include <wolfssl/ssl.h>
+#  include <wolfssl/openssl/ssl.h>
 # elif defined(HAVE_OPENSSL) && HAVE_OPENSSL
 enum {
   SSL_SUCCESS= 1,

libtest/include.am

@@ -120,9 +120,9 @@ libtest_libtest_la_SOURCES=
 libtest_libtest_la_CXXFLAGS+= @LIBMEMCACHED_CFLAGS@
 libtest_libtest_la_LIBADD+= @LIBMEMCACHED_LIB@
 if ENABLE_SSL
-if ENABLE_CYASSL
-libtest_libtest_la_LIBADD+= @CYASSL_LIB@
-libtest_libtest_la_LDFLAGS+= @CYASSL_LDFLAGS@
+if ENABLE_WOLFSSL
+libtest_libtest_la_LIBADD+= @WOLFSSL_LIB@
+libtest_libtest_la_LDFLAGS+= @WOLFSSL_LDFLAGS@
 else
 if ENABLE_OPENSSL
 libtest_libtest_la_LIBADD+= @OPENSSL_LIBS@

libtest/ssl.h

@@ -40,6 +40,6 @@
 
 #pragma once
 
-#define YATL_CA_CERT_PEM "/home/brian/cyassl/certs/ca-cert.pem"
-#define YATL_CERT_PEM "/home/brian/cyassl/certs/server-cert.pem"
-#define YATL_CERT_KEY_PEM "/home/brian/cyassl/certs/server-key.pem"
+#define YATL_CA_CERT_PEM "/home/brian/wolfssl/certs/ca-cert.pem"
+#define YATL_CERT_PEM "/home/brian/wolfssl/certs/server-cert.pem"
+#define YATL_CERT_KEY_PEM "/home/brian/wolfssl/certs/server-key.pem"