Commit 46d7f12f authored by unknown's avatar unknown

yassl build fixes for hpux and netware


extra/yassl/include/yassl_int.hpp:
  Netware and HPUX need the _POSIX_THREADS define to be forced
extra/yassl/taocrypt/include/hmac.hpp:
  Prefix with HMAC as we get symbol conflicts on HPUX
parent 0ace2b44
...@@ -40,6 +40,13 @@ ...@@ -40,6 +40,13 @@
#include "lock.hpp" #include "lock.hpp"
#include "openssl/ssl.h" // ASN1_STRING and DH #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 #ifdef _POSIX_THREADS
#include <pthread.h> #include <pthread.h>
#endif #endif
......
...@@ -60,12 +60,12 @@ private: ...@@ -60,12 +60,12 @@ private:
T mac_; T mac_;
// MSVC 6 HACK, gives compiler error if calculated in array // MSVC 6 HACK, gives compiler error if calculated in array
enum { BSIZE = T::BLOCK_SIZE / sizeof(word32), enum { HMAC_BSIZE = T::BLOCK_SIZE / sizeof(word32),
DSIZE = T::DIGEST_SIZE / sizeof(word32) }; HMAC_DSIZE = T::DIGEST_SIZE / sizeof(word32) };
word32 ip_[BSIZE]; // align ipad_ on word32 word32 ip_[HMAC_BSIZE]; // align ipad_ on word32
word32 op_[BSIZE]; // align opad_ on word32 word32 op_[HMAC_BSIZE]; // align opad_ on word32
word32 innerH_[DSIZE]; // align innerHash_ on word32 word32 innerH_[HMAC_DSIZE]; // align innerHash_ on word32
void KeyInnerHash(); void KeyInnerHash();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment