Commit c962dde0 authored by unknown's avatar unknown
Browse files

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

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


extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~10:
  Auto merged
parents 1d82f97c 5e500522

extra/yassl/README

+17 −1
Original line number Diff line number Diff line 
yaSSL Release notes, version 1.5.0 (11/09/06)

*****************yaSSL Release notes, version 1.5.0 (1/10/07)



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

    support for GCC 4.1.1 and vs2005 sp1.







    Since yaSSL now supports zlib, as does libcur, the libcurl build test can

    fail if yaSSL is built with zlib support since the zlib library isn't 

    passed.  You can do two things to fix this: 



        1) build yaSSL w/o zlib --without-zlib

        2) or add flags to curl configure LDFLAGS="-lm -lz"







*****************yaSSL Release notes, version 1.5.0 (11/09/06)



    This release of yaSSL contains bug fixes, portability enhancements,

    and full TLS 1.1 support.  Use the functions:

extra/yassl/include/openssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include "rsa.h"





#define YASSL_VERSION "1.5.0"

#define YASSL_VERSION "1.5.8"





#if defined(__cplusplus)

extra/yassl/src/make.bat

+0 −18
Original line number Diff line number Diff line 
REM quick and dirty build file for testing different MSDEVs



@echo off

REM Copyright (C) 2006 MySQL AB

REM 

REM This program is free software; you can redistribute it and/or modify

REM it under the terms of the GNU General Public License as published by

REM the Free Software Foundation; version 2 of the License.

REM 

REM This program is distributed in the hope that it will be useful,

REM but WITHOUT ANY WARRANTY; without even the implied warranty of

REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

REM GNU General Public License for more details.

REM 

REM You should have received a copy of the GNU General Public License

REM along with this program; if not, write to the Free Software

REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

@echo on



setlocal 



set myFLAGS= /I../include /I../taocrypt/mySTL /I../taocrypt/include /W3 /c /ZI

extra/yassl/src/ssl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -958,7 +958,7 @@ void ERR_print_errors_fp(FILE* /*fp*/) 


char* ERR_error_string(unsigned long errNumber, char* buffer)

{

  static char* msg = (char*) "Please supply a buffer for error string";

    static char* msg = "Please supply a buffer for error string";



    if (buffer) {

        SetErrorString(YasslError(errNumber), buffer);

extra/yassl/src/yassl_error.cpp

+10 −2
Original line number Diff line number Diff line
@@ -150,6 +150,10 @@ void SetErrorString(YasslError error, char* buffer) 
        strncpy(buffer, "the read operation would block", max);

        break;



    case CERTFICATE_ERROR :

        strncpy(buffer, "Unable to verify certificate", max);

        break;



        // TaoCrypt errors

    case NO_ERROR_E :

        strncpy(buffer, "not in error state", max);
@@ -255,8 +259,12 @@ void SetErrorString(YasslError error, char* buffer) 
        strncpy(buffer, "ASN: bad other signature confirmation", max);

        break;



    case CERTFICATE_ERROR :

        strncpy(buffer, "Unable to verify certificate", max);

    case CONTENT_E :

        strncpy(buffer, "bad content processing", max);

        break;



    case PEM_E :

        strncpy(buffer, "bad PEM format processing", max);

        break;



    default :