diff options
author | Jeffrey Walton <noloader@gmail.com> | 2017-03-11 15:55:44 -0500 |
---|---|---|
committer | Jeffrey Walton <noloader@gmail.com> | 2017-03-11 15:55:44 -0500 |
commit | 76377f8219a8d96a9163c8d841040308df96e5f6 (patch) | |
tree | 86775e81abd9b4e717f77e39ba974c3dc46b18ec /drbg.h | |
parent | ef7a6a2f4e1ad29d8c2654f6e7cb1563fca4f2b8 (diff) | |
download | cryptopp-git-76377f8219a8d96a9163c8d841040308df96e5f6.tar.gz |
Whitespace checkin
Diffstat (limited to 'drbg.h')
-rw-r--r-- | drbg.h | 37 |
1 files changed, 18 insertions, 19 deletions
@@ -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;
}
}
|