Commit 527d1805 authored by unknown's avatar unknown
Browse files

Merge 192.168.0.20:mysql/my50-yassl_3/ 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents f5b0b1c3 8bc1fa97

config/ac-macros/yassl.m4

+4 −1
Original line number Diff line number Diff line 
AC_CONFIG_FILES(extra/yassl/Makefile dnl

extra/yassl/taocrypt/Makefile dnl

extra/yassl/taocrypt/src/Makefile dnl

extra/yassl/src/Makefile)

extra/yassl/src/Makefile dnl

extra/yassl/testsuite/Makefile dnl

extra/yassl/taocrypt/test/Makefile dnl

extra/yassl/taocrypt/benchmark/Makefile)



AC_DEFUN([MYSQL_CHECK_YASSL], [

  AC_MSG_CHECKING(for yaSSL)

extra/yassl/Makefile.am

+1 −1
Original line number Diff line number Diff line 
SUBDIRS = taocrypt src

SUBDIRS = taocrypt src testsuite

EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp)

extra/yassl/README

+134 −1
Original line number Diff line number Diff line 
yaSSL Release notes, version 0.9.6

yaSSL Release notes, version 1.2.2 (03/27/06)





    This release of yaSSL contains minor bug fixes and portability enhancements.



See build instructions below under 1.0.6:







*******************yaSSL Release notes, version 1.2.0





    This release of yaSSL contains minor bug fixes, portability enhancements,

    Diffie-Hellman compatibility fixes for other servers and client,

    optimization improvements, and x86 ASM changes.



See build instructions below under 1.0.6:







*****************yaSSL Release notes, version 1.1.5



    This release of yaSSL contains minor bug fixes, portability enhancements,

    and user requested changes including the ability to add all certificates in

    a directory, more robust socket handling, no new overloading unless

    requested, and an SSL_VERIFY_NONE option.





See build instructions below under 1.0.6:







******************yaSSL Release notes, version 1.0.6



This release of yaSSL contains minor bug fixes, portability enhancements,

x86 assembly for ARC4, SHA, MD5, and RIPEMD, --enable-ia32-asm configure

option, and a security patch for certificate chain processing.



--To build on Linux, Solaris, *BSD, Mac OS X, or Cygwin:



    ./configure

    make



    run testsuite from yaSSL-Home/testsuite to test the build



to make a release build:



    ./configure --disable-debug

    make



    run testsuite from yaSSL-Home/testsuite to test the build





--To build on Win32



Choose (Re)Build All from the project workspace



run Debug\testsuite.exe from yaSSL-Home\testsuite to test the build





--To enable ia32 assembly for TaoCrypt ciphers and message digests



    On MSVC this is always on



    On GCC **, use ./configure --enable-ia32-asm

    

    ** This isn't on by default because of the use of intel syntax and the

    problem that olders versions of gas have with some addressing statements.

    If you enable this and get assemler errors during compilation or can't

    pass the TaoCrypt tests, please send todd@yassl.com a message and disable

    this option in the meantime.





***************** yaSSL Release notes, version 1.0.5



This release of yaSSL contains minor bug fixes, portability enhancements,

x86 assembly for AES, 3DES, BLOWFISH, and TWOFISH, --without-debug configure

option, and --enable-kernel-mode configure option for using TaoCrypt with

kernel modules.



--To build on Linux, Solaris, *BSD, Mac OS X, or Cygwin:



    ./configure

    make



    run testsuite from yaSSL-Home/testsuite to test the build



to make a release build:



    ./configure --without-debug

    make



    run testsuite from yaSSL-Home/testsuite to test the build





--To build on Win32



Choose (Re)Build All from the project workspace



run Debug\testsuite.exe from yaSSL-Home\testsuite to test the build





******************yaSSL Release notes, version 1.0.1



This release of yaSSL contains minor bug fixes, portability enhancements,

GCC 3.4.4 support, MSVC 2003 support, and more documentation.



Please see build instructions in the release notes for 0.9.6 below.





******************yaSSL Release notes, version 1.0



This release of yaSSL contains minor bug fixes, portability enhancements,

GCC 4.0 support, testsuite, improvements, and API additions.



Please see build instructions in the release notes for 0.9.6 below.





******************yaSSL Release notes, version 0.9.9



This release of yaSSL contains minor bug fixes, portability enchancements,

MSVC 7 support, memory improvements, and API additions.



Please see build instructions in the release notes for 0.9.6 below.





******************yaSSL Release notes, version 0.9.8



This release of yaSSL contains minor bug fixes and portability enchancements.



Please see build instructions in the release notes for 0.9.6 below.





******************yaSSL Release notes, version 0.9.6



This release of yaSSL contains minor bug fixes, removal of STL support, and

removal of exceptions and rtti so that the library can be linked without the

extra/yassl/examples/client/client.cpp

0 → 100644
+96 −0
Original line number Diff line number Diff line 
/* client.cpp  */



#include "../../testsuite/test.hpp"



//#define TEST_RESUME





void client_test(void* args)

{

#ifdef _WIN32

    WSADATA wsd;

    WSAStartup(0x0002, &wsd);

#endif



    SOCKET_T sockfd = 0;

    int      argc = 0;

    char**   argv = 0;



    set_args(argc, argv, *static_cast<func_args*>(args));

    tcp_connect(sockfd);



    SSL_METHOD* method = TLSv1_client_method();

    SSL_CTX*    ctx = SSL_CTX_new(method);



    set_certs(ctx);

    SSL* ssl = SSL_new(ctx);



    SSL_set_fd(ssl, sockfd);



    if (SSL_connect(ssl) != SSL_SUCCESS) err_sys("SSL_connect failed");

    showPeer(ssl);



    const char* cipher = 0;

    int index = 0;

    char list[1024];

    strcpy(list, "cipherlist");

    while ( (cipher = SSL_get_cipher_list(ssl, index++)) ) {

        strcat(list, ":");

        strcat(list, cipher);

    }

    printf("%s\n", list);

    printf("Using Cipher Suite %s\n", SSL_get_cipher(ssl));



    char msg[] = "hello yassl!";

    if (SSL_write(ssl, msg, sizeof(msg)) != sizeof(msg))

        err_sys("SSL_write failed");



    char reply[1024];

    reply[SSL_read(ssl, reply, sizeof(reply))] = 0;

    printf("Server response: %s\n", reply);



#ifdef TEST_RESUME

    SSL_SESSION* session   = SSL_get_session(ssl);

    SSL*         sslResume = SSL_new(ctx);

#endif



    SSL_shutdown(ssl);

    SSL_free(ssl);



#ifdef TEST_RESUME

    tcp_connect(sockfd);

    SSL_set_fd(sslResume, sockfd);

    SSL_set_session(sslResume, session);

    

    if (SSL_connect(sslResume) != SSL_SUCCESS) err_sys("SSL resume failed");

  

    if (SSL_write(sslResume, msg, sizeof(msg)) != sizeof(msg))

        err_sys("SSL_write failed");



    reply[SSL_read(sslResume, reply, sizeof(reply))] = 0;

    printf("Server response: %s\n", reply);



    SSL_shutdown(sslResume);

    SSL_free(sslResume);

#endif // TEST_RESUME



    SSL_CTX_free(ctx);

    ((func_args*)args)->return_code = 0;

}





#ifndef NO_MAIN_DRIVER



    int main(int argc, char** argv)

    {

        func_args args;



        args.argc = argc;

        args.argv = argv;



        client_test(&args);

        return args.return_code;

    }



#endif // NO_MAIN_DRIVER

extra/yassl/examples/client/client.dsp

0 → 100644
+102 −0
Original line number Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

# Microsoft Developer Studio Generated Build File, Format Version 6.00

# ** DO NOT EDIT **



# TARGTYPE "Win32 (x86) Console Application" 0x0103



CFG=client - Win32 Debug

!MESSAGE This is not a valid makefile. To build this project using NMAKE,

!MESSAGE use the Export Makefile command and run

!MESSAGE 

!MESSAGE NMAKE /f "client.mak".

!MESSAGE 

!MESSAGE You can specify a configuration when running NMAKE

!MESSAGE by defining the macro CFG on the command line. For example:

!MESSAGE 

!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"

!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

!MESSAGE 



# Begin Project

# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=cl.exe

RSC=rc.exe



!IF  "$(CFG)" == "client - Win32 Release"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "Release"

# PROP BASE Intermediate_Dir "Release"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "Release"

# PROP Intermediate_Dir "Release"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /MT /W3 /O2 /I "..\..\taocrypt\include" /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /machine:I386



!ELSEIF  "$(CFG)" == "client - Win32 Debug"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir "Debug"

# PROP BASE Intermediate_Dir "Debug"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1

# PROP Output_Dir "Debug"

# PROP Intermediate_Dir "Debug"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\taocrypt\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c

# ADD BASE RSC /l 0x409 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept



!ENDIF 



# Begin Target



# Name "client - Win32 Release"

# Name "client - Win32 Debug"

# Begin Group "Source Files"



# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

# Begin Source File



SOURCE=.\client.cpp

# End Source File

# End Group

# Begin Group "Header Files"



# PROP Default_Filter "h;hpp;hxx;hm;inl"

# End Group

# Begin Group "Resource Files"



# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

# End Group

# End Target

# End Project