Cleared issues 11,12,13 (Clang integrated assembler), 58 (RC rollup), 66 (Coverity rollup)

1 files changed, 12 insertions, 9 deletions

diff --git a/sha.h b/sha.h
index 85d21c41..90ff1ab0 100644
--- a/sha.h
+++ b/sha.h
@@ -1,11 +1,14 @@
+// sha.h - written and placed in the public domain by Wei Dai

+

+//! \file

+//! \headerfile sha.h

+//! \brief Classes for SHA-1 and SHA-2 family of message digests

+

 #ifndef CRYPTOPP_SHA_H

 #define CRYPTOPP_SHA_H

 

 #include "config.h"

 #include "iterhash.h"

-#include "secblock.h"

-

-#define SHA_BOOL_ALIGN (CRYPTOPP_BOOL_ALIGN || CRYPTOPP_BOOL_ALIGN16)

 

 NAMESPACE_BEGIN(CryptoPP)

 

@@ -21,10 +24,10 @@ public:
 typedef SHA1 SHA;	// for backwards compatibility

 

 //! implements the SHA-256 standard

-class CRYPTOPP_DLL SHA256 : public IteratedHashWithStaticTransform<word32, BigEndian, 64, 32, SHA256, 32, SHA_BOOL_ALIGN>

+class CRYPTOPP_DLL SHA256 : public IteratedHashWithStaticTransform<word32, BigEndian, 64, 32, SHA256, 32, true>

 {

 public:

-#if (defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X32_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_SHA_ASM)

+#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X32_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE) && !defined(CRYPTOPP_DISABLE_SHA_ASM)

 	size_t HashMultipleBlocks(const word32 *input, size_t length);

 #endif

 	static void CRYPTOPP_API InitState(HashWordType *state);

@@ -33,10 +36,10 @@ public:
 };

 

 //! implements the SHA-224 standard

-class CRYPTOPP_DLL SHA224 : public IteratedHashWithStaticTransform<word32, BigEndian, 64, 32, SHA224, 28, SHA_BOOL_ALIGN>

+class CRYPTOPP_DLL SHA224 : public IteratedHashWithStaticTransform<word32, BigEndian, 64, 32, SHA224, 28, true>

 {

 public:

-#if (defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X32_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_SHA_ASM)

+#if defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X32_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE) && !defined(CRYPTOPP_DISABLE_SHA_ASM)

 	size_t HashMultipleBlocks(const word32 *input, size_t length);

 #endif

 	static void CRYPTOPP_API InitState(HashWordType *state);

@@ -45,7 +48,7 @@ public:
 };

 

 //! implements the SHA-512 standard

-class CRYPTOPP_DLL SHA512 : public IteratedHashWithStaticTransform<word64, BigEndian, 128, 64, SHA512, 64, SHA_BOOL_ALIGN>

+class CRYPTOPP_DLL SHA512 : public IteratedHashWithStaticTransform<word64, BigEndian, 128, 64, SHA512, 64, (CRYPTOPP_BOOL_X86|CRYPTOPP_BOOL_X32)>

 {

 public:

 	static void CRYPTOPP_API InitState(HashWordType *state);

@@ -54,7 +57,7 @@ public:
 };

 

 //! implements the SHA-384 standard

-class CRYPTOPP_DLL SHA384 : public IteratedHashWithStaticTransform<word64, BigEndian, 128, 64, SHA384, 48, SHA_BOOL_ALIGN>

+class CRYPTOPP_DLL SHA384 : public IteratedHashWithStaticTransform<word64, BigEndian, 128, 64, SHA384, 48, (CRYPTOPP_BOOL_X86|CRYPTOPP_BOOL_X32)>

 {

 public:

 	static void CRYPTOPP_API InitState(HashWordType *state);