Commit a5bfbd2d authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 

into  neptunus.(none):/home/msvensson/mysql/work/my51-work


extra/yassl/include/yassl_int.hpp:
  Auto merged
parents 4a488c06 46d7f12f

extra/yassl/include/yassl_int.hpp

+7 −0
Original line number Diff line number Diff line
@@ -40,6 +40,13 @@ 
#include "lock.hpp"

#include "openssl/ssl.h"  // ASN1_STRING and DH



// Check if _POSIX_THREADS should be forced

#if !defined(_POSIX_THREADS) && (defined(__NETWARE__) || defined(__hpux))

// HPUX does not define _POSIX_THREADS as it's not _fully_ implemented

// Netware supports pthreads but does not announce it

#define _POSIX_THREADS

#endif



#ifdef _POSIX_THREADS

    #include <pthread.h>

#endif

extra/yassl/taocrypt/include/hmac.hpp

+5 −5
Original line number Diff line number Diff line
@@ -60,12 +60,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();