Commit fa91c7bc authored by unknown's avatar unknown
Browse files

Merge 192.168.0.20:mysql/my50-maint-yassl 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/taocrypt/src/make.bat:
  Auto merged
extra/yassl/testsuite/test.hpp:
  Auto merged
parents 23aeb617 c3398d13

extra/yassl/examples/client/client.cpp

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ void client_test(void* args) 
        args.argv = argv;



        client_test(&args);

        yaSSL_CleanUp();



        return args.return_code;

    }

extra/yassl/examples/echoclient/echoclient.cpp

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ void echoclient_test(void* args) 
        args.argv = argv;



        echoclient_test(&args);

        yaSSL_CleanUp();



        return args.return_code;

    }

extra/yassl/examples/echoserver/echoserver.cpp

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
        args.argv = argv;



        echoserver_test(&args);

        yaSSL_CleanUp();



        return args.return_code;

    }

extra/yassl/examples/server/server.cpp

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ THREAD_RETURN YASSL_API server_test(void* args) 
        args.argv = argv;



        server_test(&args);

        yaSSL_CleanUp();



        return args.return_code;

    }

extra/yassl/include/openssl/ssl.h

+13 −0
Original line number Diff line number Diff line
@@ -32,6 +32,19 @@ 
#include "opensslv.h" /* for version number */

#include "rsa.h"



#if defined(__cplusplus)

extern "C" {

#endif



 void yaSSL_CleanUp();   /* call once at end of application use to

                                      free static singleton memory holders,

                                      not a leak per se, but helpful when 

                                      looking for them                      */



#if defined(__cplusplus)

} // extern

#endif



#if defined(__cplusplus) && !defined(YASSL_MYSQL_COMPATIBLE)

namespace yaSSL {

extern "C" {