Update comments

blake2-simd.cpp

@@ -29,7 +29,7 @@
 # define EXCEPTION_EXECUTE_HANDLER 1
 #endif
 
-// Clang __m128i casts
+// Clang __m128i casts, http://bugs.llvm.org/show_bug.cgi?id=20670
 #define M128_CAST(x) ((__m128i *)(void *)(x))
 #define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
 

gcm-simd.cpp

@@ -49,7 +49,7 @@
 # define EXCEPTION_EXECUTE_HANDLER 1
 #endif
 
-// Clang __m128i casts
+// Clang __m128i casts, http://bugs.llvm.org/show_bug.cgi?id=20670
 #define M128_CAST(x) ((__m128i *)(void *)(x))
 #define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
 

gcm.cpp

@@ -51,7 +51,7 @@ NAMESPACE_BEGIN(CryptoPP)
 #endif
 #endif  // CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
 
-// Clang __m128i casts
+// Clang __m128i casts, http://bugs.llvm.org/show_bug.cgi?id=20670
 #define M128_CAST(x) ((__m128i *)(void *)(x))
 #define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
 

rijndael-simd.cpp

@@ -56,7 +56,7 @@
 # define MAYBE_CONST const
 #endif
 
-// Clang __m128i casts
+// Clang __m128i casts, http://bugs.llvm.org/show_bug.cgi?id=20670
 #define M128_CAST(x) ((__m128i *)(void *)(x))
 #define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
 
@@ -684,7 +684,7 @@ void Rijndael_UncheckedSetKey_SSE4_AESNI(const byte *userKey, size_t keyLen, wor
 	}
 }
 
-void Rijndael_UncheckedSetKeyRev_SSE4_AESNI(word32 *key, unsigned int rounds)
+void Rijndael_UncheckedSetKeyRev_AESNI(word32 *key, unsigned int rounds)
 {
 	unsigned int i, j;
 	__m128i temp;

rijndael.cpp

@@ -80,6 +80,11 @@ being unloaded from L1 cache, until that round is finished.
 
 NAMESPACE_BEGIN(CryptoPP)
 
+// Clang 3.3 integrated assembler crash on Linux
+#if CRYPTOPP_BOOL_X32 || (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400))
+# define CRYPTOPP_DISABLE_RIJNDAEL_ASM
+#endif
+
 // Hack for http://github.com/weidai11/cryptopp/issues/42 and http://github.com/weidai11/cryptopp/issues/132
 #if (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)
 # define CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS 1
@@ -224,7 +229,7 @@ void Rijndael::Base::FillDecTable()
 
 #if (CRYPTOPP_AESNI_AVAILABLE)
 extern void Rijndael_UncheckedSetKey_SSE4_AESNI(const byte *userKey, size_t keyLen, word32* rk);
-extern void Rijndael_UncheckedSetKeyRev_SSE4_AESNI(word32 *key, unsigned int rounds);
+extern void Rijndael_UncheckedSetKeyRev_AESNI(word32 *key, unsigned int rounds);
 
 extern size_t Rijndael_Enc_AdvancedProcessBlocks_AESNI(const word32 *subkeys, size_t rounds,
         const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags);
@@ -256,7 +261,7 @@ void Rijndael::Base::UncheckedSetKey(const byte *userKey, unsigned int keyLen, c
 		//  Atoms have SSE2-SSSE3 and AES-NI, but not SSE4.1 or SSE4.2.
 		Rijndael_UncheckedSetKey_SSE4_AESNI(userKey, keyLen, rk);
 		if (!IsForwardTransformation())
-			Rijndael_UncheckedSetKeyRev_SSE4_AESNI(m_key, m_rounds);
+			Rijndael_UncheckedSetKeyRev_AESNI(m_key, m_rounds);
 
 		return;
 	}

rijndael.h

@@ -12,11 +12,6 @@
 #include "seckey.h"
 #include "secblock.h"
 
-// Clang 3.3 integrated assembler crash on Linux
-#if CRYPTOPP_BOOL_X32 || (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400))
-# define CRYPTOPP_DISABLE_RIJNDAEL_ASM
-#endif
-
 #if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARM64
 # define CRYPTOPP_ENABLE_ADVANCED_PROCESS_BLOCKS 1
 #endif

sha-simd.cpp

@@ -47,6 +47,8 @@
 
 NAMESPACE_BEGIN(CryptoPP)
 
+// ***************** SIGILL probes ********************
+
 #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY
 extern "C" {
     typedef void (*SigHandler)(int);
@@ -189,6 +191,9 @@ bool CPU_ProbeSHA2()
 }
 #endif  // ARM32 or ARM64
 
+// ***************** Intel x86 SHA ********************
+
+// provided by sha.cpp
 extern const word32 SHA256_K[64];
 
 ///////////////////////////////////
@@ -603,6 +608,8 @@ void SHA256_HashMultipleBlocks_SHANI(word32 *state, const word32 *data, size_t l
 // end of Walton/Gulley's code //
 /////////////////////////////////
 
+// ***************** ARMV8 SHA ********************
+
 /////////////////////////////////////////////////////////
 // start of Walton/Schneiders/O'Rourke/Hovsmith's code //
 /////////////////////////////////////////////////////////

shacal2-simd.cpp

@@ -38,7 +38,7 @@
 # include "arm_acle.h"
 #endif
 
-// Clang __m128i casts
+// Clang __m128i casts, http://bugs.llvm.org/show_bug.cgi?id=20670
 #define M128_CAST(x) ((__m128i *)(void *)(x))
 #define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))