summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2010-07-24 06:12:23 +0000
committerweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2010-07-24 06:12:23 +0000
commite66a4497451a7c2920d1a68d38b5dfc5f376954f (patch)
tree7459b302c10303edf56066f79da7157d7fd127f6
parent8532f317b3440154b421b1e8b8b004ead28f847e (diff)
downloadcryptopp-e66a4497451a7c2920d1a68d38b5dfc5f376954f.tar.gz
fix compile on Linux
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@509 57ff6487-cd31-0410-9ec3-f628ee90f5f0
-rw-r--r--misc.cpp4
-rw-r--r--rijndael.cpp1
-rw-r--r--secblock.h4
3 files changed, 5 insertions, 4 deletions
diff --git a/misc.cpp b/misc.cpp
index f16af66..3c2c2a5 100644
--- a/misc.cpp
+++ b/misc.cpp
@@ -8,6 +8,10 @@
#include "words.h"
#include <new>
+#if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX)
+#include <malloc.h>
+#endif
+
NAMESPACE_BEGIN(CryptoPP)
void xorbuf(byte *buf, const byte *mask, size_t count)
diff --git a/rijndael.cpp b/rijndael.cpp
index fbc7dcc..9a77902 100644
--- a/rijndael.cpp
+++ b/rijndael.cpp
@@ -74,6 +74,7 @@ being unloaded from L1 cache, until that round is finished.
#include "cpu.h"
#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
+#include <smmintrin.h>
#include <wmmintrin.h>
#endif
diff --git a/secblock.h b/secblock.h
index ecb397f..24b9fc0 100644
--- a/secblock.h
+++ b/secblock.h
@@ -7,10 +7,6 @@
#include "misc.h"
#include <assert.h>
-#if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX)
- #include <malloc.h>
-#endif
-
NAMESPACE_BEGIN(CryptoPP)
// ************** secure memory allocation ***************