Commit 59041a2b authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents a5dd3d5d 3eef1c16

config/ac-macros/yassl.m4

+4 −3
Original line number Diff line number Diff line
@@ -23,10 +23,11 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 


    # System specific checks

    yassl_integer_extra_cxxflags=""

    case $SYSTEM_TYPE--$CXX_VERSION in

       sparc*solaris*--*Sun*C++*5.6*)

    case $host_cpu--$CXX_VERSION in

        sparc*--*Sun*C++*5.6*)

	# Disable inlining when compiling taocrypt/src/integer.cpp

	yassl_integer_extra_cxxflags="+d"

        AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/integer.cpp])

        ;;

    esac

    AC_SUBST([yassl_integer_extra_cxxflags])

extra/yassl/mySTL/vector.hpp

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ struct vector_base { 
    vector_base() : start_(0), finish_(0), end_of_storage_(0) {}

    vector_base(size_t n)

    {

        start_ = static_cast<T*>(malloc(n * sizeof(T)));

        // Don't allow malloc(0), if n is 0 use 1

        start_ = static_cast<T*>(malloc((n ? n : 1) * sizeof(T)));

        if (!start_) abort();

        finish_ = start_;

        end_of_storage_ = start_ + n;

extra/yassl/taocrypt/include/hmac.hpp

+5 −5
Original line number Diff line number Diff line
@@ -56,12 +56,12 @@ private: 
    T     mac_;



    // MSVC 6 HACK, gives compiler error if calculated in array

    enum { BSIZE = T::BLOCK_SIZE  / sizeof(word32),

           DSIZE = T::DIGEST_SIZE / sizeof(word32) };

    enum { HMAC_BSIZE = T::BLOCK_SIZE  / sizeof(word32),

           HMAC_DSIZE = T::DIGEST_SIZE / sizeof(word32) };



    word32 ip_[BSIZE];          // align ipad_ on word32

    word32 op_[BSIZE];          // align opad_ on word32

    word32 innerH_[DSIZE];      // align innerHash_ on word32

    word32 ip_[HMAC_BSIZE];          // align ipad_ on word32

    word32 op_[HMAC_BSIZE];          // align opad_ on word32

    word32 innerH_[HMAC_DSIZE];      // align innerHash_ on word32



    void KeyInnerHash();