Commit 93be6a80 authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.0-build 

into mysql.com:/home/svoj/devel/mysql/mysql-5.0-build
parents f210d1dd 4679c7a8

extra/yassl/src/cert_wrapper.cpp

+2 −2
Original line number Diff line number Diff line
@@ -273,8 +273,8 @@ int CertManager::SetPrivateKey(const x509& key) 
    privateKey_.assign(key.get_buffer(), key.get_length());



    // set key type

    if (x509* cert = list_.front()) {

        TaoCrypt::Source source(cert->get_buffer(), cert->get_length());

    if (x509* cert509 = list_.front()) {

        TaoCrypt::Source source(cert509->get_buffer(), cert509->get_length());

        TaoCrypt::CertDecoder cert(source, false);

        cert.DecodeToKey();

        if (int err = cert.GetError().What())

extra/yassl/taocrypt/include/error.hpp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ UNKOWN_HASH_E = 1034, // "unknown hash OID" 
DSA_SZ_E        = 1035, // "bad DSA r or s size"

BEFORE_DATE_E   = 1036, // "before date in the future"

AFTER_DATE_E    = 1037, // "after date in the past"

SIG_CONFIRM_E   = 1038, // "bad signature confirmation"

SIG_CONFIRM_E   = 1038  // "bad signature confirmation"



};

extra/yassl/taocrypt/include/misc.hpp

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ typedef unsigned int word32; 
            typedef word32 word;

            typedef word64 dword;

    #else

            typedef word8  hword;

            typedef byte   hword;

            typedef word16 word;

            typedef word32 dword;

    #endif

tools/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ 


INCLUDES=-I$(top_srcdir)/include $(openssl_includes) \

	-I$(top_builddir)/include

LDADD=  @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ \

	$(top_builddir)/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@ 

LDADD=  @CLIENT_EXTRA_LDFLAGS@ \

        $(top_builddir)/libmysql_r/libmysqlclient_r.la \

        @openssl_libs@ @ZLIB_LIBS@ 

bin_PROGRAMS=		mysqltestmanager

mysqltestmanager_SOURCES=	mysqlmanager.c

mysqltestmanager_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)