Whitespace checkin

1 files changed, 18 insertions, 19 deletions

diff --git a/drbg.h b/drbg.h
index 875074c5..659ac680 100644
--- a/drbg.h
+++ b/drbg.h
@@ -463,7 +463,7 @@ void Hash_DRBG<HASH, STRENGTH, SEEDLENGTH>::Hash_Generate(const byte* additional
         {

             carry = m_v[i] + w[j] + carry;

             m_v[i] = static_cast<byte>(carry);

-            j--; i--; carry >>= 8;

+            i--; j--; carry >>= 8;

         }

         while (i>=0)

         {

@@ -503,27 +503,27 @@ void Hash_DRBG<HASH, STRENGTH, SEEDLENGTH>::Hash_Generate(const byte* additional
         CRYPTOPP_ASSERT(HASH::DIGESTSIZE >= sizeof(m_reseed));

         int carry=0, k=sizeof(m_reseed)-1, j=HASH::DIGESTSIZE-1, i=SEEDLENGTH-1;

 

-		// Using Integer class slows things down by about 8 cpb.		

-		// Using word128 and word64 benefits the first loop only by about 2 cpb.

+        // Using Integer class slows things down by about 8 cpb.

+        // Using word128 and word64 benefits the first loop only by about 2 cpb.

 #if defined(CRYPTOPP_WORD128_AVAILABLE)

-		byte* p1 = m_v.begin()+SEEDLENGTH-8;

-		byte* p2 = m_c.begin()+SEEDLENGTH-8;

-		byte* p3 = h.begin()+HASH::DIGESTSIZE-8;

-

-		word64 w1 = GetWord<word64>(false, BIG_ENDIAN_ORDER, p1);

-		word64 w2 = GetWord<word64>(false, BIG_ENDIAN_ORDER, p2);

-		word64 w3 = GetWord<word64>(false, BIG_ENDIAN_ORDER, p3);

-		word64 w4 = m_reseed;

-

-		word128 r = static_cast<word128>(w1) + w2 + w3 + w4;

-		PutWord(false, BIG_ENDIAN_ORDER, p1, static_cast<word64>(r));

-		j -= 8; i -= 8; k=0; carry = static_cast<int>(r >> 64);

+        byte* p1 = m_v.begin()+SEEDLENGTH-8;

+        byte* p2 = m_c.begin()+SEEDLENGTH-8;

+        byte* p3 = h.begin()+HASH::DIGESTSIZE-8;

+

+        const word64 w1 = GetWord<word64>(false, BIG_ENDIAN_ORDER, p1);

+        const word64 w2 = GetWord<word64>(false, BIG_ENDIAN_ORDER, p2);

+        const word64 w3 = GetWord<word64>(false, BIG_ENDIAN_ORDER, p3);

+        const word64 w4 = m_reseed;

+

+        word128 r = static_cast<word128>(w1) + w2 + w3 + w4;

+        PutWord(false, BIG_ENDIAN_ORDER, p1, static_cast<word64>(r));

+        i -= 8; j -= 8; k=0; carry = static_cast<int>(r >> 64);

 #else

         while (k>=0)

         {

             carry = m_v[i] + m_c[i] + h[j] + GetByte<word64>(BIG_ENDIAN_ORDER, m_reseed, k) + carry;

             m_v[i] = static_cast<byte>(carry);

-            k--; j--; i--; carry >>= 8;

+            i--; j--; k--; carry >>= 8;

         }

 #endif

 

@@ -531,15 +531,14 @@ void Hash_DRBG<HASH, STRENGTH, SEEDLENGTH>::Hash_Generate(const byte* additional
         {

             carry = m_v[i] + m_c[i] + h[j] + carry;

             m_v[i] = static_cast<byte>(carry);

-            j--; i--; carry >>= 8;

+            i--; j--; carry >>= 8;

         }

 

         while (i>=0)

         {

             carry = m_v[i] + m_c[i] + carry;

             m_v[i] = static_cast<byte>(carry);

-            i--;

-			carry >>= 8;

+            i--; carry >>= 8;

         }

 

     }