nerdcruft/libcruft-crypto
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hash/blake2: prefer std::array over bare arrays

Browse Source
This commit is contained in:
Danny Robson 2019-02-10 15:45:40 +11:00
parent a8f718f1d9
commit bd940f0256
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hash/blake2.cpp
View File

@ -69,8 +69,15 @@ sigma[12][16] {
// mixing function // mixing function
static constexpr static constexpr
void void
G (word_t v[16], int a, int b, int c, int d, word_t x, word_t y) G (
{ std::array<word_t,16> &v,
int const a,
int const b,
int const c,
int const d,
word_t x,
word_t y
) {
v[a] = v[a] + v[b] + x; v[d] = cruft::rotater (v[d] ^ v[a], traits::rotations[0]); v[a] = v[a] + v[b] + x; v[d] = cruft::rotater (v[d] ^ v[a], traits::rotations[0]);
v[c] = v[c] + v[d]; v[b] = cruft::rotater (v[b] ^ v[c], traits::rotations[1]); v[c] = v[c] + v[d]; v[b] = cruft::rotater (v[b] ^ v[c], traits::rotations[1]);
@ -84,7 +91,7 @@ G (word_t v[16], int a, int b, int c, int d, word_t x, word_t y)
static void static void
F (std::array<word_t,8> &h, const word_t m[16], u64 t, bool const f) F (std::array<word_t,8> &h, const word_t m[16], u64 t, bool const f)
{ {
word_t v[16] { std::array<word_t,16> v {
h[0], h[1], h[2], h[3], h[4], h[5], h[6], h[7], h[0], h[1], h[2], h[3], h[4], h[5], h[6], h[7],
traits::iv[0], traits::iv[0],