[myserver-commit] [2932] GNU TLS preferred over OpenSSL.

[Giuseppe Scrivano]

Revision: 2932
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2932
Author:   gscrivano
Date:     2008-11-02 18:04:00 +0000 (Sun, 02 Nov 2008)

Log Message:
-----------
GNU TLS preferred over OpenSSL.

Modified Paths:
--------------
    trunk/myserver/COPYING
    trunk/myserver/binaries/certificates/how_create_certificates.txt
    trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am
    trunk/myserver/binaries/web/cgi-src/post/Makefile.am
    trunk/myserver/configure.in
    trunk/myserver/include/base/socket/socket.h
    trunk/myserver/include/base/socket/ssl_socket.h
    trunk/myserver/include/base/ssl/ssl.h
    trunk/myserver/src/Makefile.am
    trunk/myserver/src/base/socket/ssl_socket.cpp
    trunk/myserver/src/base/ssl/ssl.cpp
    trunk/myserver/src/server/server.cpp
    trunk/myserver/tests/Makefile.am

Modified: trunk/myserver/COPYING
===================================================================
--- trunk/myserver/COPYING      2008-11-02 15:00:53 UTC (rev 2931)
+++ trunk/myserver/COPYING      2008-11-02 18:04:00 UTC (rev 2932)
@@ -1,16 +1,3 @@
-GNU MyServer is released under the terms of the GNU General Public License 
(GPL)
-with the additional exception that compiling, linking, and using OpenSSL is 
allowed.
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-
-
            GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007
 

Modified: trunk/myserver/binaries/certificates/how_create_certificates.txt
===================================================================
--- trunk/myserver/binaries/certificates/how_create_certificates.txt    
2008-11-02 15:00:53 UTC (rev 2931)
+++ trunk/myserver/binaries/certificates/how_create_certificates.txt    
2008-11-02 18:04:00 UTC (rev 2932)
@@ -1,11 +1,10 @@
-Use the openSSL package that you can get at
-http://www.openssl.org. 
+In order to generate a certificate you need the certtool utility
+provided by GNU TLS.
+Look here for more information: http://www.gnu.org/software/gnutls/.
 
-After you have installed openSSL, execute the following commands:
+certtool --generate-privkey --outfile server.key
+certtool --generate-self-signed --load-privkey server.key --outfile server.pem
 
-openssl genrsa  -out server.key 
-openssl req -new -x509 -days 730 -key server.key -out server.pem 
-
 These commands will create two files server.key and server.pem. Put
 them in this directory and configure your virtual host file to use these
 files adding the following lines under the <VHOST> section:

Modified: trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am
===================================================================
--- trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am    2008-11-02 
15:00:53 UTC (rev 2931)
+++ trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am    2008-11-02 
18:04:00 UTC (rev 2932)
@@ -9,7 +9,7 @@
 
 math_sum.mscgi : $(libmath_sum_a_OBJECTS) $(libmath_sum_a_DEPENDENCIES)
        -rm -f math_sum.mscgi
-       $(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a 
$(libmath_sum_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o math_sum.mscgi 
-shared $(CXXFLAGS) $(XML_CFLAGS)
+       $(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a 
$(libmath_sum_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o math_sum.mscgi 
-shared $(CXXFLAGS) $(XML_CFLAGS)
 
 install : math_sum.mscgi
        $(INSTALL) -D 'math_sum.mscgi' 
'$(root_prefix)/var/web/cgi-bin/math_sum.mscgi'

Modified: trunk/myserver/binaries/web/cgi-src/post/Makefile.am
===================================================================
--- trunk/myserver/binaries/web/cgi-src/post/Makefile.am        2008-11-02 
15:00:53 UTC (rev 2931)
+++ trunk/myserver/binaries/web/cgi-src/post/Makefile.am        2008-11-02 
18:04:00 UTC (rev 2932)
@@ -10,7 +10,7 @@
 
 post.mscgi : $(libpost_a_OBJECTS) $(libpost_a_DEPENDENCIES)
        -rm -f post.mscgi
-       $(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a 
$(libpost_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o post.mscgi 
-shared $(CXXFLAGS) $(XML_CFLAGS)
+       $(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a 
$(libpost_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o post.mscgi -shared 
$(CXXFLAGS) $(XML_CFLAGS)
 
 install : post.mscgi
        $(INSTALL) -D 'post.mscgi' '$(root_prefix)/var/web/cgi-bin/post.mscgi'

Modified: trunk/myserver/configure.in
===================================================================
--- trunk/myserver/configure.in 2008-11-02 15:00:53 UTC (rev 2931)
+++ trunk/myserver/configure.in 2008-11-02 18:04:00 UTC (rev 2932)
@@ -216,43 +216,14 @@
        CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
 fi
 
-OPENSSL_INC=""
+AC_CHECK_LIB(gnutls-openssl, main, have_ssl=yes)
 
-AC_ARG_WITH(openssl-include,
-  [[  --with-openssl-include=PATH       Use the given path to the openssl 
include files.]],
-  [
-        OPENSSL_INC=$withval
-  ])
+if test x_$have_ssl == x_yes; then
+   SSL_LIB="-lgnutls-openssl"
+else
+   AC_MSG_ERROR(Cannot find ssl libraries)
+fi
 
-dnl CHECKING FOR OPENSSL
-    for dir in $OPENSSL_INC /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg 
/usr/local /usr; do
-        ssldir="$dir";
-        if test -f "$dir/include/openssl/ssl.h"; then
-            found_ssl="yes";
-            CFLAGS="$CFLAGS -I$ssldir/include/openssl -DHAVE_SSL";
-            CXXFLAGS="$CXXFLAGS -I$ssldir/include/openssl -DHAVE_SSL";
-            break
-        fi
-        if test -f "$dir/include/ssl.h"; then
-            found_ssl="yes";
-            CFLAGS="$CFLAGS -I$ssldir/include/ -DHAVE_SSL";
-            CXXFLAGS="$CXXFLAGS -I$ssldir/include/ -DHAVE_SSL";
-            break
-        fi
-    done
-    if test x_$found_ssl != x_yes; then
-        AC_MSG_ERROR(Cannot find ssl libraries)
-       AC_DEFINE(DO_NOT_USE_SSL, 1, [SSL support in MyServer, define to 1 to 
disable])
-       OPENSSL_LIB="" # not set
-    else
-        printf "OpenSSL found in $ssldir\n";
-        LDFLAGS="$LDFLAGS -L$ssldir/lib";
-                               OPENSSL_LIB="-lssl -lcrypto" # myserver
-        HAVE_SSL="yes"
-    fi
-    AC_SUBST(HAVE_SSL)
-    AC_SUBST(OPENSSL_LIB) # myserver
-
 dnl Looking for zlib
 AC_CHECK_LIB(z, uncompress, have_libz=yes)
 if test x$have_libz != xyes; then
@@ -279,8 +250,8 @@
 fi
 
 AC_SUBST(ZLIB_LIB)
+AC_SUBST(SSL_LIB)
 
-
 if test x$enable_ipv6 = xyes; then
     dnl Check for IPv6
     AC_MSG_CHECKING([for IPv6])

Modified: trunk/myserver/include/base/socket/socket.h
===================================================================
--- trunk/myserver/include/base/socket/socket.h 2008-11-02 15:00:53 UTC (rev 
2931)
+++ trunk/myserver/include/base/socket/socket.h 2008-11-02 18:04:00 UTC (rev 
2932)
@@ -25,17 +25,6 @@
 #include <string>
 using namespace std;
 
-#ifndef DO_NOT_USE_SSL
-#include<openssl/ssl.h>
-#include<openssl/crypto.h>
-#include<openssl/lhash.h>
-#include<openssl/err.h>
-#include<openssl/bn.h>
-#include<openssl/pem.h>
-#include<openssl/x509.h>
-#include<openssl/rand.h>
-#endif
-
 #ifdef WIN32
 #ifndef SOCKETLIBINCLUDED
 extern "C"

Modified: trunk/myserver/include/base/socket/ssl_socket.h
===================================================================
--- trunk/myserver/include/base/socket/ssl_socket.h     2008-11-02 15:00:53 UTC 
(rev 2931)
+++ trunk/myserver/include/base/socket/ssl_socket.h     2008-11-02 18:04:00 UTC 
(rev 2932)
@@ -26,16 +26,7 @@
 #include <string>
 using namespace std;
 
-#ifndef DO_NOT_USE_SSL
-#include<openssl/ssl.h>
-#include<openssl/crypto.h>
-#include<openssl/lhash.h>
-#include<openssl/err.h>
-#include<openssl/bn.h>
-#include<openssl/pem.h>
-#include<openssl/x509.h>
-#include<openssl/rand.h>
-#endif
+#include <gnutls/openssl.h>
 
 
 #ifdef NOT_WIN
@@ -57,10 +48,8 @@
        int setSSLContext(SSL_CTX*);
        int sslAccept();
 
-#ifndef DO_NOT_USE_SSL
        int freeSSL();
        SSL* getSSLConnection();
-#endif
 
        virtual int close();
        virtual int shutdown(int how);
@@ -68,27 +57,25 @@
        virtual int recv(char* buffer,int len,int flags);
        virtual int rawSend(const char* buffer, int len, int flags);
        virtual u_long bytesToRead();
+
 #ifdef __HURD__
        virtual int dataOnRead(int sec = 1, int usec = 500);
 #else
        virtual int dataOnRead(int sec = 0, int usec = 500);
 #endif
 
-
        SslSocket(Socket*);
        ~SslSocket();
 
 protected:
        bool externalContext;
        Socket* socket;
-#ifndef DO_NOT_USE_SSL
        SSL *sslConnection;
        SSL_CTX *sslContext;
-       X509 *clientCert;
+       const X509 *clientCert;
 
   /*! This is used only by clients sockets.  */
   SSL_METHOD* sslMethod;
-#endif
 };
 
 

Modified: trunk/myserver/include/base/ssl/ssl.h
===================================================================
--- trunk/myserver/include/base/ssl/ssl.h       2008-11-02 15:00:53 UTC (rev 
2931)
+++ trunk/myserver/include/base/ssl/ssl.h       2008-11-02 18:04:00 UTC (rev 
2932)
@@ -21,33 +21,13 @@
 
 #include "stdafx.h"
 
-#ifdef DO_NOT_USE_SSL
-typedef int SSL_CTX;
-typedef int SSL_METHOD;
-#else 
-#include <openssl/ssl.h>
-#include <openssl/rsa.h>
-#include <openssl/crypto.h>
-#include <openssl/lhash.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
-#include <openssl/rand.h>
-#endif
-
+#include <gnutls/openssl.h>
 #include <string>
 
 using namespace std;
 
 class SslContext
 {
-       SSL_CTX* context;
-       SSL_METHOD* method;
-
-       string certificateFile;
-       string privateKeyFile;
-       string password;
 public:
        SslContext();
 
@@ -61,12 +41,17 @@
        string& getPrivateKeyFile(){return privateKeyFile;}
        string& getPassword(){return password;}
 
-       void setCertificateFile(string& c){certificateFile.assign(c);}
-       void setPrivateKeyFile(string& pk){privateKeyFile.assign(pk);}
-       void setPassword(string& p){password.assign(p);}
+       void setCertificateFile(string& c){certificateFile.assign (c);}
+       void setPrivateKeyFile(string& pk){privateKeyFile.assign (pk);}
+       void setPassword(string& p){password.assign (p);}
 
 private:
-       void generateRsaKey();
+       SSL_CTX* context;
+       SSL_METHOD* method;
+
+       string certificateFile;
+       string privateKeyFile;
+       string password;
 };
 
 void initializeSSL();

Modified: trunk/myserver/src/Makefile.am
===================================================================
--- trunk/myserver/src/Makefile.am      2008-11-02 15:00:53 UTC (rev 2931)
+++ trunk/myserver/src/Makefile.am      2008-11-02 18:04:00 UTC (rev 2932)
@@ -7,7 +7,7 @@
 myserver_CXXFLAGS = $(CXXFLAGS) $(XML_CFLAGS) -DHOST_STR=\"$(build)\" 
-DPREFIX=\"$(prefix)\"
 myserver_LDFLAGS =  -rdynamic
 myserver_LDADD = libmyserver.a $(PTHREAD_LIB) $(IDN_LIB) \
-       $(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) \
+       $(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) \
        $(XML_LIBS) $(LDFLAGS)
 
 

Modified: trunk/myserver/src/base/socket/ssl_socket.cpp
===================================================================
--- trunk/myserver/src/base/socket/ssl_socket.cpp       2008-11-02 15:00:53 UTC 
(rev 2931)
+++ trunk/myserver/src/base/socket/ssl_socket.cpp       2008-11-02 18:04:00 UTC 
(rev 2932)
@@ -43,21 +43,17 @@
  */
 SslSocket::SslSocket(Socket* socket) : Socket(socket)
 {
-#ifndef DO_NOT_USE_SSL
   this->socket = socket;
   sslConnection = 0;
   sslContext = 0;
   clientCert = 0;
   sslMethod = 0;
   externalContext = false;
-#endif
 }
 
 SslSocket::~SslSocket()
 {
-#ifndef DO_NOT_USE_SSL
   freeSSL();
-#endif
 }
 
 /*!
@@ -65,9 +61,8 @@
  */
 int SslSocket::close()
 {
-#ifndef DO_NOT_USE_SSL
   freeSSL();
-#endif
+
   return Socket::close();
 }
 
@@ -76,12 +71,10 @@
  */
 int SslSocket::shutdown(int how)
 {
-#ifndef DO_NOT_USE_SSL
   if(sslConnection)
   {
     SSL_shutdown(sslConnection);
   }
-#endif
 
 #ifdef WIN32
   return ::shutdown(socketHandle, how);
@@ -99,7 +92,6 @@
  */
 int SslSocket::rawSend(const char* buffer, int len, int flags)
 {
-#ifndef DO_NOT_USE_SSL
   int err;
   do
   {
@@ -111,7 +103,6 @@
     return -1;
   else
     return err;
-#endif
 }
 
 /*!
@@ -127,7 +118,7 @@
 #endif
 )
      return 1;//Andu: TODO our error code or what?
-#ifndef DO_NOT_USE_SSL
+
   sslMethod = SSLv23_client_method();
   /*! Create the local context. */
   sslContext = SSL_CTX_new(sslMethod);
@@ -158,23 +149,19 @@
   }
   externalContext = false;
   return 0;
-#endif
 }
 
-
 /*!
  *Set the SSL context.
  */
 int SslSocket::setSSLContext(SSL_CTX* context)
 {
-#ifndef DO_NOT_USE_SSL
   sslContext = context;
   externalContext = true;
-#endif
+
   return 1;
 }
 
-#ifndef DO_NOT_USE_SSL
 /*!
  *Free the SSL connection.
  */
@@ -204,15 +191,12 @@
   return sslConnection;
 }
 
-#endif /*Endif for routines used only with the SSL library*/
-
 /*!
  *SSL handshake procedure.
  *Return nonzero on errors.
  */
 int SslSocket::sslAccept()
 {
-#ifndef DO_NOT_USE_SSL
   int sslAccept;
   if(sslContext == 0)
     return -1;
@@ -224,7 +208,7 @@
     freeSSL();
     return -1;
   }
-  SSL_set_accept_state(sslConnection);
+
   if(SSL_set_fd(sslConnection,socketHandle) == 0)
   {
     shutdown(2);
@@ -235,9 +219,8 @@
   
   do
   {
-    sslAccept = SSL_accept(sslConnection);
-  }while(SSL_get_error(sslConnection, sslAccept) == SSL_ERROR_WANT_X509_LOOKUP
-         || SSL_get_error(sslConnection, sslAccept) == SSL_ERROR_WANT_READ);
+    sslAccept = SSL_accept (sslConnection);
+  }while (SSL_get_error (sslConnection, sslAccept) == SSL_ERROR_WANT_READ);
 
   if(sslAccept != 1 )
   {
@@ -246,20 +229,10 @@
     close();
     return -1;
   }
-  SSL_set_read_ahead(sslConnection, 0);
 
-  clientCert = SSL_get_peer_certificate(sslConnection);
+  clientCert = SSL_get_peer_certificate (sslConnection);
 
-  if(SSL_get_verify_result(sslConnection) != X509_V_OK)
-  {
-    shutdown(2);
-    freeSSL();
-    close();
-    return -1;
-  }
-#endif
   return 0;
-
 }
 
 
@@ -270,21 +243,20 @@
 int SslSocket::recv(char* buffer, int len, int flags)
 {
   int err = 0;
-#ifndef DO_NOT_USE_SSL
-  if(sslConnection)
+
+  if (sslConnection)
   {
     for (;;)
     {
       int sslError;
-      err = SSL_read(sslConnection, buffer, len);
+      err = SSL_read (sslConnection, buffer, len);
 
       if (err > 0)
         break;
 
       sslError = SSL_get_error (sslConnection, err);
       
-      if ((sslError != SSL_ERROR_WANT_X509_LOOKUP) &&
-          (sslError != SSL_ERROR_WANT_READ) &&
+      if ((sslError != SSL_ERROR_WANT_READ) &&
           (sslError != SSL_ERROR_WANT_WRITE))
         break;
     }
@@ -294,7 +266,7 @@
     else
       return err;
   }
-#endif
+
   return 0;
 }
 
@@ -304,29 +276,23 @@
 u_long SslSocket::bytesToRead()
 {
   u_long nBytesToRead = 0;
-#ifndef DO_NOT_USE_SSL
-  nBytesToRead = SSL_pending(sslConnection);
 
-  if(nBytesToRead)
+  nBytesToRead = SSL_pending (sslConnection);
+
+  if (nBytesToRead)
     return nBytesToRead;
 
-  return Socket::bytesToRead();
-#endif
-  return nBytesToRead;
+  return Socket::bytesToRead ();
 }
 
-
-
 /*!
- *Returns the number of bytes waiting to be read.
+ *Check if there is data ready to be read.
  */
-int SslSocket::dataOnRead(int, int)
+int SslSocket::dataOnRead (int sec, int usec)
 {
-  return Socket::dataOnRead(0, 0);
-
-  if(bytesToRead())
+  if(bytesToRead ())
     return 1;
 
-  return 0;
+  return Socket::dataOnRead (sec, usec);
 }
 

Modified: trunk/myserver/src/base/ssl/ssl.cpp
===================================================================
--- trunk/myserver/src/base/ssl/ssl.cpp 2008-11-02 15:00:53 UTC (rev 2931)
+++ trunk/myserver/src/base/ssl/ssl.cpp 2008-11-02 18:04:00 UTC (rev 2932)
@@ -18,19 +18,8 @@
 #include <include/base/ssl/ssl.h>
 #include <include/base/file/files_utility.h>
 
-/*!
- *SSL password callback function.
- */
-static int passwordCb(char *buf,int num,int /*!rwflag*/,void *userdata)
-{
-  if((size_t)num < strlen((char*)userdata) + 1)
-    return 0;
+#include <string.h>
 
-  ((string*)userdata)->assign(buf);
-
-  return ((string*)userdata)->length();
-}
-
 SslContext::SslContext()
 {
   context = 0;
@@ -38,7 +27,6 @@
 
   certificateFile.assign("");
   privateKeyFile.assign("");
-  password.assign("");
 }
 
 /*!
@@ -48,7 +36,6 @@
 {
   context = 0;
   method = 0;
-#ifndef DO_NOT_USE_SSL
   method = SSLv23_server_method();
   context = SSL_CTX_new(method);
 
@@ -58,17 +45,11 @@
    *The specified file doesn't exist.
    */
   if(FilesUtility::fileExists(certificateFile.c_str()) == 0)
-  {
     return -1;
-  }
   
-  if(!(SSL_CTX_use_certificate_chain_file(context, certificateFile.c_str())))
+  if(!SSL_CTX_use_certificate_file (context, certificateFile.c_str 
(),SSL_FILETYPE_PEM))
     return -1;
 
-  SSL_CTX_set_default_passwd_cb_userdata(context, &password);
-
-  SSL_CTX_set_default_passwd_cb(context, passwordCb);
-
   /*
    *The specified file doesn't exist.
    */
@@ -80,36 +61,11 @@
     return -1;
 
 
-#if (OPENSSL_VERSION_NUMBER < 0x0090600fL)
-  SSL_CTX_set_verify_depth(context, 1);
-#endif
   return 1;
-#else
-  return 1;
-#endif
 }  
 
-/*!
- *Generate a RSA key and pass it to the SSL context.
- */
-void SslContext::generateRsaKey()
-{
-#ifndef DO_NOT_USE_SSL
-  RSA *rsa;
-
-  rsa = RSA_generate_key(2048, RSA_F4, NULL, NULL);
-
-  if (!SSL_CTX_set_tmp_rsa(context, rsa))
-    return;
-
-  RSA_free(rsa);
-#endif
-}
-
-
 int SslContext::free()
 {
-#ifndef DO_NOT_USE_SSL
   int ret = 0;
   if(context)
   {
@@ -122,14 +78,10 @@
   certificateFile.assign("");
   privateKeyFile.assign("");
   return ret;
-#else
-  return 1;
-#endif
 }
 
 void initializeSSL()
 {
-#ifndef DO_NOT_USE_SSL
   static bool initialized = false;
   if(!initialized)
   {
@@ -137,7 +89,6 @@
     SSL_library_init();
     initialized = true;
   }
-#endif
 }
 
 void cleanupSSL()

Modified: trunk/myserver/src/server/server.cpp
===================================================================
--- trunk/myserver/src/server/server.cpp        2008-11-02 15:00:53 UTC (rev 
2931)
+++ trunk/myserver/src/server/server.cpp        2008-11-02 18:04:00 UTC (rev 
2932)
@@ -236,6 +236,8 @@
   XmlParser::startXML();
   myserver_safetime_init();
 
+  gnutls_global_init ();
+
   /* Startup the socket library.  */
   logWriteln(languageParser.getValue("MSG_ISOCK") );
 

Modified: trunk/myserver/tests/Makefile.am
===================================================================
--- trunk/myserver/tests/Makefile.am    2008-11-02 15:00:53 UTC (rev 2931)
+++ trunk/myserver/tests/Makefile.am    2008-11-02 18:04:00 UTC (rev 2932)
@@ -3,4 +3,4 @@
 
 bin_PROGRAMS = tests_suite
 tests_suite_SOURCES = main.cpp test_connection.cpp test_ftp.cpp 
test_log_manager.cpp test_mime_manager.cpp test_mutex.cpp 
test_security_domain.cpp test_validator.cpp test_auth_domain.cpp 
test_connections_scheduler.cpp test_gzip.cpp test_log_stream_factory.cpp 
test_pipe.cpp test_security_manager.cpp test_validator_factory.cpp 
test_base64.cpp test_file_stream.cpp test_hashmap.cpp test_md5.cpp 
test_recursive_mutex.cpp test_semaphore.cpp test_xml.cpp 
test_cached_file_buffer.cpp test_file_stream_creator.cpp test_homedir.cpp 
test_mem_buff.cpp test_regex.cpp test_socket_stream_creator.cpp 
test_cached_file.cpp test_files_utility.cpp test_http_request.cpp 
test_http_req_security_domain.cpp test_mem_stream.cpp test_safetime.cpp 
test_thread.cpp test_cached_file_factory.cpp test_filter_chain.cpp 
test_http_response.cpp test_multicast.cpp test_security_cache.cpp 
test_security_token.cpp test_utility.cpp  test_xml_validator.cpp test_ip.cpp
-tests_suite_LDADD = ../src/libmyserver.a $(CPPUNIT_LDFLAGS) $(PTHREAD_LIB) 
$(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) 
$(XML_LIBS) $(LDFLAGS)
+tests_suite_LDADD = ../src/libmyserver.a $(CPPUNIT_LDFLAGS) $(PTHREAD_LIB) 
$(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) 
$(XML_LIBS) $(LDFLAGS)