From 4fb9fbf5ac8a0659f1b8dd5cbbbb3aa666f4cb19 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Fri, 24 Aug 2018 12:19:42 -0400
Subject: [PATCH] Update comments

---
 iterhash.h |  4 ++--
 misc.h     |  4 ++--
 secblock.h | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/iterhash.h b/iterhash.h
index f642ab47..edaa18e2 100644
--- a/iterhash.h
+++ b/iterhash.h
@@ -152,8 +152,8 @@ public:
 	{
 		CRYPTOPP_ASSERT(in != NULLPTR);
 		CRYPTOPP_ASSERT(out != NULLPTR);
-		CRYPTOPP_ASSERT(IsAligned<T_HashWordType*>(in));
-		CRYPTOPP_ASSERT(IsAligned<T_HashWordType*>(out));
+		CRYPTOPP_ASSERT(IsAligned<T_HashWordType>(in));
+		CRYPTOPP_ASSERT(IsAligned<T_HashWordType>(out));
 
 		ConditionalByteReverse(T_Endianness::ToEnum(), out, in, byteCount);
 	}
diff --git a/misc.h b/misc.h
index 5ae39d13..12d300e7 100644
--- a/misc.h
+++ b/misc.h
@@ -2072,8 +2072,8 @@ void ByteReverse(T *out, const T *in, size_t byteCount)
 {
 	// Alignment check due to Issues 690
 	CRYPTOPP_ASSERT(byteCount % sizeof(T) == 0);
-	CRYPTOPP_ASSERT(IsAligned<T*>(in));
-	CRYPTOPP_ASSERT(IsAligned<T*>(out));
+	CRYPTOPP_ASSERT(IsAligned<T>(in));
+	CRYPTOPP_ASSERT(IsAligned<T>(out));
 
 	size_t count = byteCount/sizeof(T);
 	for (size_t i=0; i<count; i++)
diff --git a/secblock.h b/secblock.h
index 62d872bc..40fe51ac 100644
--- a/secblock.h
+++ b/secblock.h
@@ -511,8 +511,13 @@ private:
 
 #else
 
+	// The 8-byte alignments follows convention of Linux and Windows.
+	// Linux and Windows receives most testing. Duplicate it here for
+	// other platforms like AIX and Solaris. AIX and Solaris often use
+	// alignments smaller than expected. In fact AIX caught us by
+	// surprise with word16 and word32.
 	T* GetAlignedArray() {return m_array;}
-	T m_array[S];
+	CRYPTOPP_ALIGN_DATA(8) T m_array[S];
 #endif
 
 	A m_fallbackAllocator;
@@ -657,8 +662,13 @@ public:
 
 private:
 
+	// The 8-byte alignments follows convention of Linux and Windows.
+	// Linux and Windows receives most testing. Duplicate it here for
+	// other platforms like AIX and Solaris. AIX and Solaris often use
+	// alignments smaller than expected. In fact AIX caught us by
+	// surprise with word16 and word32.
 	T* GetAlignedArray() {return m_array;}
-	T m_array[S];
+	CRYPTOPP_ALIGN_DATA(8) T m_array[S];
 
 	A m_fallbackAllocator;
 	bool m_allocated;