From 011429583d3e85c09a8d726fbae4f7822ce736ee Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sun, 13 Aug 2017 07:06:19 -0400
Subject: [PATCH] Fix sources after sync with upstream master

---
 gcm.cpp      | 12 ++++++------
 rijndael.cpp |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/gcm.cpp b/gcm.cpp
index 9be90493..a097ce11 100644
--- a/gcm.cpp
+++ b/gcm.cpp
@@ -23,10 +23,6 @@
 // # undef CRYPTOPP_CLMUL_AVAILABLE
 // #endif
 
-// Clang casts
-#define M128I_CAST(x) ((__m128i *)(void *)(x))
-#define CONST_M128I_CAST(x) ((const __m128i *)(const void *)(x))
-
 #include "gcm.h"
 #include "cpu.h"
 
@@ -53,6 +49,10 @@ NAMESPACE_BEGIN(CryptoPP)
 #endif
 #endif
 
+// Clang __m128i casts
+#define M128_CAST(x) ((__m128i *)(void *)(x))
+#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
+
 #if CRYPTOPP_ARM_NEON_AVAILABLE
 extern void GCM_Xor16_NEON(byte *a, const byte *b, const byte *c);
 #endif
@@ -80,12 +80,12 @@ inline static void GCM_Xor16_SSE2(byte *a, const byte *b, const byte *c)
 // SunCC 5.14 crash (bewildering since asserts are not in effect in release builds)
 //   Also see http://github.com/weidai11/cryptopp/issues/226 and http://github.com/weidai11/cryptopp/issues/284
 # if __SUNPRO_CC
-    *(__m128i *)(void *)a = _mm_xor_si128(*(__m128i *)(void *)b, *(__m128i *)(void *)c);
+    *M128_CAST(a) = _mm_xor_si128(*M128_CAST(b), *M128_CAST(c));
 # elif CRYPTOPP_SSE2_AVAILABLE
     CRYPTOPP_ASSERT(IsAlignedOn(a,GetAlignmentOf<__m128i>()));
     CRYPTOPP_ASSERT(IsAlignedOn(b,GetAlignmentOf<__m128i>()));
     CRYPTOPP_ASSERT(IsAlignedOn(c,GetAlignmentOf<__m128i>()));
-    *M128I_CAST(a) = _mm_xor_si128(*M128I_CAST(b), *M128I_CAST(c));
+    *M128_CAST(a) = _mm_xor_si128(*M128_CAST(b), *M128_CAST(c));
 # else
     asm ("movdqa %1, %%xmm0; pxor %2, %%xmm0; movdqa %%xmm0, %0;" : "=m" (a[0]) : "m"(b[0]), "m"(c[0]));
 # endif
diff --git a/rijndael.cpp b/rijndael.cpp
index 9a81cac1..e04d323c 100644
--- a/rijndael.cpp
+++ b/rijndael.cpp
@@ -92,10 +92,6 @@ NAMESPACE_BEGIN(CryptoPP)
 # define MAYBE_CONST const
 #endif
 
-// Clang casts
-#define M128I_CAST(x) ((__m128i *)(void *)(x))
-#define CONST_M128I_CAST(x) ((const __m128i *)(const void *)(x))
-
 #if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)
 # if (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_RIJNDAEL_ASM)
 namespace rdtable {CRYPTOPP_ALIGN_DATA(16) word64 Te[256+2];}