Merge lp:~brianaker/gearmand/cyassl-1.2-part-2 into lp:gearmand

[Brian Aker]

Don't expect make test to work.

=== modified file 'configure.ac'
--- configure.ac	2013-05-12 20:30:19 +0000
+++ configure.ac	2013-05-13 02:54:27 +0000
@@ -208,6 +208,9 @@
 AC_CHECK_FUNC([bind],[],[AC_CHECK_LIB([bind],[bind])])
 
 
+# Check for CyaSSL
+AX_CHECK_LIBRARY([CYASSL],[cyassl/ssl.h],[cyassl])
+
 # Check for the ability to call dlopen (used in libhostile)
 AX_DLOPEN
 
 
=== modified file 'libgearman-server/include.am'
--- libgearman-server/include.am	2013-05-06 11:51:41 +0000
+++ libgearman-server/include.am	2013-05-13 02:54:27 +0000
@@ -95,3 +95,4 @@
 libgearman_server_libgearman_server_la_LIBADD+= @LIBM@
 libgearman_server_libgearman_server_la_LIBADD+= @DL_LIB@
 libgearman_server_libgearman_server_la_LIBADD+= @RT_LIB@
+libgearman_server_libgearman_server_la_LIBADD+= @CYASSL_LIB@
 
=== modified file 'libgearman-server/io.cc'
--- libgearman-server/io.cc	2013-05-12 01:03:50 +0000
+++ libgearman-server/io.cc	2013-05-13 02:54:27 +0000
@@ -66,6 +66,12 @@
   }
   else
   {
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+    if (connection->root and connection->root->_ssl)
+    {
+      CyaSSL_shutdown(connection->root->_ssl);
+    }
+#endif
     (void)gearmand_sockfd_close(connection->fd);
     assert_msg(false, "We should never have an internal fd");
   }
@@ -99,7 +105,11 @@
 
   while (1)
   {
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+    read_size= CyaSSL_recv(con->_ssl, data, data_size, MSG_DONTWAIT);
+#else
     read_size= recv(connection->fd, data, data_size, MSG_DONTWAIT);
+#endif
 
     if (read_size == 0)
     {
@@ -228,7 +238,12 @@
     case gearmand_io_st::GEARMAND_CON_UNIVERSAL_CONNECTED:
       while (connection->send_buffer_size)
       {
-        ssize_t write_size= send(connection->fd, connection->send_buffer_ptr, connection->send_buffer_size, MSG_NOSIGNAL|MSG_DONTWAIT);
+        ssize_t write_size;
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+        write_size= CyaSSL_send(con->_ssl, connection->send_buffer_ptr, connection->send_buffer_size, MSG_NOSIGNAL|MSG_DONTWAIT);
+#else
+        write_size= send(connection->fd, connection->send_buffer_ptr, connection->send_buffer_size, MSG_NOSIGNAL|MSG_DONTWAIT);
+#endif
 
         if (write_size == 0) // detect infinite loop?
         {
 
=== modified file 'libgearman-server/plugins/protocol/gear/protocol.cc'
--- libgearman-server/plugins/protocol/gear/protocol.cc	2013-05-07 11:07:18 +0000
+++ libgearman-server/plugins/protocol/gear/protocol.cc	2013-05-13 02:54:27 +0000
@@ -50,9 +50,16 @@
 #include <cstdio>
 #include <cstdlib>
 
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+# include <cyassl/ssl.h>
+#endif
+
 #include <libgearman-server/plugins/protocol/gear/protocol.h>
 #include "libgearman/command.h"
 
+#define CERT_PEM "/home/brian/cyassl/certs/server-cert.pem"
+#define CERT_KEY_PEM "/home/brian/cyassl/certs/server-key.pem"
+
 static gearmand_error_t gearmand_packet_unpack_header(gearmand_packet_st *packet)
 {
   uint32_t tmp;
@@ -300,9 +307,40 @@
 
 static Geartext gear_context;
 
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+static struct CYASSL_CTX *ctx_ssl= NULL;
+#endif
+
 static gearmand_error_t _gear_con_add(gearman_server_con_st *connection)
 {
-  gearmand_info("Gear connection made");
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+  assert(ctx_ssl);
+  if ((connection->_ssl = CyaSSL_new(ctx_ssl)) == NULL)
+  {
+    return gearmand_log_error(GEARMAN_DEFAULT_LOG_PARAM, "CyaSSL_new() failed");
+  }
+
+  CyaSSL_set_fd(connection->_ssl, connection->con.fd);
+
+  bool connecting= true;
+  while (connecting)
+  {
+    if (CyaSSL_accept(connection->_ssl) == SSL_SUCCESS)
+    {
+      connecting= false;
+      break;
+    }
+
+    if (CyaSSL_get_error(connection->_ssl, 0) != SSL_ERROR_WANT_READ)
+    {
+      int cyassl_error= CyaSSL_get_error(connection->_ssl, 0);
+      char cyassl_error_buffer[1024]= { 0 };
+      CyaSSL_ERR_error_string(cyassl_error, cyassl_error_buffer);
+      return gearmand_log_error(GEARMAN_DEFAULT_LOG_PARAM, "%s(%d)", cyassl_error_buffer, cyassl_error);
+    }
+  }
+  gearmand_log_info(GEARMAN_DEFAULT_LOG_PARAM, "GearSSL connection made: %d", connection->con.fd);
+#endif
 
   connection->set_protocol(&gear_context);
 
@@ -314,11 +352,41 @@
 
 Gear::Gear() :
   Plugin("Gear")
-{
-  command_line_options().add_options()
-    ("port,p", boost::program_options::value(&_port)->default_value(GEARMAN_DEFAULT_TCP_PORT_STRING),
-     "Port the server should listen on.");
-}
+  {
+    command_line_options().add_options()
+      ("port,p", boost::program_options::value(&_port)->default_value(GEARMAN_DEFAULT_TCP_PORT_STRING),
+       "Port the server should listen on.");
+
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+    CyaSSL_Init();
+
+    ctx_ssl= CyaSSL_CTX_new(CyaTLSv1_2_server_method());
+
+    if (access(CERT_PEM, R_OK) == -1)
+    {
+      assert("access()" == NULL);
+    }
+
+    if (CyaSSL_CTX_use_certificate_file(ctx_ssl, CERT_PEM, SSL_FILETYPE_PEM) != SSL_SUCCESS)
+    {   
+      CyaSSL_CTX_free(ctx_ssl);
+      gearmand_fatal("CyaSSL_CTX_use_certificate_file() cannot obtain certificate");
+    }
+
+    if (access(CERT_KEY_PEM, R_OK) == -1)
+    {
+      gearmand_fatal("access(CERT_KEY_PEM, R_OK) == -1");
+    }
+
+    if (CyaSSL_CTX_use_PrivateKey_file(ctx_ssl, CERT_KEY_PEM, SSL_FILETYPE_PEM) != SSL_SUCCESS)
+    {   
+      CyaSSL_CTX_free(ctx_ssl);
+      gearmand_fatal("CyaSSL_CTX_use_PrivateKey_file() cannot obtain certificate");
+    }
+
+    assert(ctx_ssl);
+#endif
+  }
 
 Gear::~Gear()
 {
 
=== modified file 'libgearman-server/struct/gearmand.h'
--- libgearman-server/struct/gearmand.h	2013-05-05 01:54:09 +0000
+++ libgearman-server/struct/gearmand.h	2013-05-13 02:54:27 +0000
@@ -38,6 +38,9 @@
 #pragma once
 
 #include "libgearman-server/struct/server.h"
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+# include <cyassl/ssl.h>
+#endif
 
 #include "libgearman-server/struct/port.h"
 
@@ -174,6 +177,10 @@
     }
   }
   
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+  CYASSL_CTX *ctx_ssl;
+#endif
+
   bool exceptions() const
   {
     return _exceptions;
 
=== modified file 'libgearman-server/struct/io.h'
--- libgearman-server/struct/io.h	2013-05-05 01:54:09 +0000
+++ libgearman-server/struct/io.h	2013-05-13 02:54:27 +0000
@@ -39,6 +39,10 @@
 
 #include "libgearman-server/plugins/base.h"
 
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+# include <cyassl/ssl.h>
+#endif
+
 struct gearmand_io_st
 {
   struct {
@@ -162,4 +166,7 @@
       protocol= NULL;
     }
   }
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+  CYASSL* _ssl;
+#endif
 };
 
=== modified file 'libgearman/connection.hpp'
--- libgearman/connection.hpp	2013-05-04 12:05:03 +0000
+++ libgearman/connection.hpp	2013-05-13 02:54:27 +0000
@@ -42,6 +42,10 @@
 #include "libgearman/interface/packet.hpp"
 #include "libgearman/interface/universal.hpp"
 
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+# include <cyassl/ssl.h>
+#endif
+
 struct gearman_connection_st
 {
   struct Options {
@@ -63,6 +67,10 @@
   short events;
   short revents;
   int fd;
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+  CYASSL* ssl;
+  CYASSL_CTX* ctx_ssl;
+#endif
   int cached_errno;
   uint32_t created_id;
   uint32_t created_id_next;
 
=== modified file 'libgearman/include.am'
--- libgearman/include.am	2013-05-07 11:07:18 +0000
+++ libgearman/include.am	2013-05-13 02:54:27 +0000
@@ -133,8 +133,9 @@
 
 libgearman_libgearman_la_LDFLAGS+= -version-info $(GEARMAN_LIBRARY_VERSION)
 
+libgearman_libgearman_la_LIBADD+= @CYASSL_LIB@
+libgearman_libgearman_la_LIBADD+= @DL_LIB@
 libgearman_libgearman_la_LIBADD+= @LIBUUID_LIB@
-libgearman_libgearman_la_LIBADD+= @DL_LIB@
 libgearman_libgearman_la_LIBADD+= libhashkit/libhashkit.la
 
 if TARGET_LINUX