Remove temporary array for SHA1. Whitespace and comments

iterhash.cpp

@@ -82,6 +82,9 @@ template <class T, class BASE> byte * IteratedHashBase<T, BASE>::CreateUpdateSpa
 
 template <class T, class BASE> size_t IteratedHashBase<T, BASE>::HashMultipleBlocks(const T *input, size_t length)
 {
+	// Hardware based SHA1 and SHA256 correct blocks themselves due to hardware requirements.
+	//  For Intel, SHA1 will effectively call ByteReverse(). SHA256 formats data to Intel
+	//  requirements, which means eight words ABCD EFGH are transformed to ABEF CDGH.
 	unsigned int blockSize = this->BlockSize();
 	bool noReverse = NativeByteOrderIs(this->GetByteOrder());
 	T* dataBuf = this->DataBuf();

nbtheory.h

@@ -150,7 +150,7 @@ class CRYPTOPP_DLL PrimeAndGenerator
 public:
 	//! \brief Construct a PrimeAndGenerator
 	PrimeAndGenerator() {}
-	
+
 	//! \brief Construct a PrimeAndGenerator
 	//! \param delta +1 or -1
 	//! \param rng a RandomNumberGenerator derived class
@@ -161,12 +161,12 @@ public:
 	//! \warning This PrimeAndGenerator() is slow because primes of this form are harder to find.
 	PrimeAndGenerator(signed int delta, RandomNumberGenerator &rng, unsigned int pbits)
 		{Generate(delta, rng, pbits, pbits-1);}
-	
+
 	//! \brief Construct a PrimeAndGenerator
 	//! \param delta +1 or -1
 	//! \param rng a RandomNumberGenerator derived class
-	//! \param pbits the number of bits in the prime p	
+	//! \param pbits the number of bits in the prime p
-	//! \param qbits the number of bits in the prime q	
+	//! \param qbits the number of bits in the prime q
 	//! \details PrimeAndGenerator() generates a random prime p of the form <tt>2*r*q+delta</tt>, where q is also prime.
 	//!    Internally the constructor calls <tt>Generate(delta, rng, pbits, qbits)</tt>.
 	//! \pre <tt>qbits > 4 && pbits > qbits</tt>
@@ -176,15 +176,15 @@ public:
 	//! \brief Generate a Prime and Generator
 	//! \param delta +1 or -1
 	//! \param rng a RandomNumberGenerator derived class
-	//! \param pbits the number of bits in the prime p	
+	//! \param pbits the number of bits in the prime p
-	//! \param qbits the number of bits in the prime q	
+	//! \param qbits the number of bits in the prime q
 	//! \details Generate() generates a random prime p of the form <tt>2*r*q+delta</tt>, where q is also prime.
 	void Generate(signed int delta, RandomNumberGenerator &rng, unsigned int pbits, unsigned qbits);
 
 	//! \brief Retrieve first prime
 	//! \returns Prime() returns the prime p.
 	const Integer& Prime() const {return p;}
-	
+
 	//! \brief Retrieve second prime
 	//! \returns SubPrime() returns the prime q.
 	const Integer& SubPrime() const {return q;}

sha.cpp

@@ -106,8 +106,11 @@ static void SHA1_SSE_SHA_Transform(word32 *state, const word32 *data)
     __m128i ABCD, ABCD_SAVE, E0, E0_SAVE, E1;
     __m128i MASK, MSG0, MSG1, MSG2, MSG3;
 
-    word32 T[16];
+    // IteratedHashBase<T> has code to perform this step before HashEndianCorrectedBlock()
-    ByteReverse(T, data, 64);
+    //  is called, but the design does not lend itself to optional hardware components
+    //  where SHA1 needs reversing, but SHA256 does not.
+    word32* dataBuf = const_cast<word32*>(data);
+    ByteReverse(dataBuf, dataBuf, 64);
 
     // Load initial values
     ABCD = _mm_loadu_si128((__m128i*) state);
@@ -120,14 +123,14 @@ static void SHA1_SSE_SHA_Transform(word32 *state, const word32 *data)
     E0_SAVE = E0;
 
     // Rounds 0-3
-    MSG0 = _mm_loadu_si128((__m128i*) T+0);
+    MSG0 = _mm_loadu_si128((__m128i*) data+0);
     MSG0 = _mm_shuffle_epi8(MSG0, MASK);
     E0 = _mm_add_epi32(E0, MSG0);
     E1 = ABCD;
     ABCD = _mm_sha1rnds4_epu32(ABCD, E0, 0);
 
     // Rounds 4-7
-    MSG1 = _mm_loadu_si128((__m128i*) (T+4));
+    MSG1 = _mm_loadu_si128((__m128i*) (data+4));
     MSG1 = _mm_shuffle_epi8(MSG1, MASK);
     E1 = _mm_sha1nexte_epu32(E1, MSG1);
     E0 = ABCD;
@@ -135,7 +138,7 @@ static void SHA1_SSE_SHA_Transform(word32 *state, const word32 *data)
     MSG0 = _mm_sha1msg1_epu32(MSG0, MSG1);
 
     // Rounds 8-11
-    MSG2 = _mm_loadu_si128((__m128i*) (T+8));
+    MSG2 = _mm_loadu_si128((__m128i*) (data+8));
     MSG2 = _mm_shuffle_epi8(MSG2, MASK);
     E0 = _mm_sha1nexte_epu32(E0, MSG2);
     E1 = ABCD;
@@ -144,7 +147,7 @@ static void SHA1_SSE_SHA_Transform(word32 *state, const word32 *data)
     MSG0 = _mm_xor_si128(MSG0, MSG2);
 
     // Rounds 12-15
-    MSG3 = _mm_loadu_si128((__m128i*) (T+12));
+    MSG3 = _mm_loadu_si128((__m128i*) (data+12));
     MSG3 = _mm_shuffle_epi8(MSG3, MASK);
     E1 = _mm_sha1nexte_epu32(E1, MSG3);
     E0 = ABCD;
@@ -879,7 +882,7 @@ static void CRYPTOPP_FASTCALL SHA256_SSE_SHA_HashBlocks(word32 *state, const wor
     __m128i TMSG0, TMSG1, TMSG2, TMSG3;
     __m128i ABEF_SAVE, CDGH_SAVE;
 
-    // Load initial hash values
+    // Load initial values
     TMP = _mm_loadu_si128((__m128i*) &state[0]);
     STATE1 = _mm_loadu_si128((__m128i*) &state[4]);
     MASK = _mm_set_epi64x(W64LIT(0x0c0d0e0f08090a0b), W64LIT(0x0405060700010203));
@@ -891,7 +894,7 @@ static void CRYPTOPP_FASTCALL SHA256_SSE_SHA_HashBlocks(word32 *state, const wor
 
     while (length)
     {
-        // Save hash values for addition after rounds
+        // Save current hash
         ABEF_SAVE = STATE0;
         CDGH_SAVE = STATE1;
 
@@ -1047,7 +1050,7 @@ static void CRYPTOPP_FASTCALL SHA256_SSE_SHA_HashBlocks(word32 *state, const wor
         MSG = _mm_shuffle_epi32(MSG, 0x0E);
         STATE0 = _mm_sha256rnds2_epu32(STATE0, STATE1, MSG);
 
-        // Add current hash values with previously saved
+        // Add values back to state
         STATE0 = _mm_add_epi32(STATE0, ABEF_SAVE);
         STATE1 = _mm_add_epi32(STATE1, CDGH_SAVE);
 
@@ -1055,12 +1058,12 @@ static void CRYPTOPP_FASTCALL SHA256_SSE_SHA_HashBlocks(word32 *state, const wor
         length -= SHA256::BLOCKSIZE;
     }
 
-    // Write hash values back in the correct order
     TMP = _mm_shuffle_epi32(STATE0, 0x1B); // FEBA
     STATE1 = _mm_shuffle_epi32(STATE1, 0xB1); // DCHG
     STATE0 = _mm_blend_epi16(TMP, STATE1, 0xF0); // DCBA
     STATE1 = _mm_alignr_epi8(STATE1, TMP, 8); // ABEF
 
+    // Save state
     _mm_storeu_si128((__m128i*) &state[0], STATE0);
     _mm_storeu_si128((__m128i*) &state[4], STATE1);
 }