diff options
| author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2010-07-28 23:45:28 +0000 |
|---|---|---|
| committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2010-07-28 23:45:28 +0000 |
| commit | dd6b53792ce52a8e10d85d4420f3946d87419d44 (patch) | |
| tree | bde360b98068b9d3a00a87fe84dd56f2e58edf53 /gcm.cpp | |
| parent | ee715577df497906aa90034572677835e4702a76 (diff) | |
| download | cryptopp-dd6b53792ce52a8e10d85d4420f3946d87419d44.tar.gz | |
fix compile on Sun CC
fix compile for non-x86 CPUs
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@511 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'gcm.cpp')
| -rw-r--r-- | gcm.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -15,8 +15,8 @@ #endif
#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-#include <tmmintrin.h> -#include <wmmintrin.h> +#include <tmmintrin.h>
+#include <wmmintrin.h>
#endif
NAMESPACE_BEGIN(CryptoPP)
@@ -336,7 +336,11 @@ void GCM_Base::Resync(const byte *iv, size_t len) unsigned int GCM_Base::OptimalDataAlignment() const
{
- return HasSSE2() ? 16 : GetBlockCipher().OptimalDataAlignment();
+ return
+#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
+ HasSSE2() ? 16 :
+#endif
+ GetBlockCipher().OptimalDataAlignment();
}
#pragma warning(disable: 4731) // frame pointer register 'ebp' modified by inline assembly code
|