diff options
| author | aunsane <aunsane@gmail.com> | 2018-07-18 00:06:49 +0300 |
|---|---|---|
| committer | aunsane <aunsane@gmail.com> | 2018-07-18 00:17:42 +0300 |
| commit | 5a8dadd96ca13797f67c39079ba5c4889ef8c421 (patch) | |
| tree | 0532b9a3c21feb03a6a3be810f559ebf0af45947 /libs/libsodium/src/crypto_generichash | |
| parent | 39d52f0ab12ecf2a3a5f48bf7af140db282a13a6 (diff) | |
updated libsodium
Diffstat (limited to 'libs/libsodium/src/crypto_generichash')
3 files changed, 8 insertions, 11 deletions
diff --git a/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-compress-avx2.h b/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-compress-avx2.h index 21acb2fa0c..bc7e42d25e 100644 --- a/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-compress-avx2.h +++ b/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-compress-avx2.h @@ -2,9 +2,6 @@ #ifndef blake2b_compress_avx2_H #define blake2b_compress_avx2_H -#define LOAD128(p) _mm_load_si128((__m128i *) (p)) -#define STORE128(p, r) _mm_store_si128((__m128i *) (p), r) - #define LOADU128(p) _mm_loadu_si128((__m128i *) (p)) #define STOREU128(p, r) _mm_storeu_si128((__m128i *) (p), r) diff --git a/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-compress-ref.c b/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-compress-ref.c index 614fa34af7..b0422c93f1 100644 --- a/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-compress-ref.c +++ b/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-compress-ref.c @@ -34,12 +34,12 @@ blake2b_compress_ref(blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES]) uint64_t v[16]; int i; - for (i = 0; i < 16; ++i) + for (i = 0; i < 16; ++i) { m[i] = LOAD64_LE(block + i * sizeof(m[i])); - - for (i = 0; i < 8; ++i) + } + for (i = 0; i < 8; ++i) { v[i] = S->h[i]; - + } v[8] = blake2b_IV[0]; v[9] = blake2b_IV[1]; v[10] = blake2b_IV[2]; diff --git a/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-ref.c b/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-ref.c index 91435a1b16..1d7adb76e2 100644 --- a/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-ref.c +++ b/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2b-ref.c @@ -51,9 +51,9 @@ blake2b_is_lastblock(const blake2b_state *S) static inline int blake2b_set_lastblock(blake2b_state *S) { - if (S->last_node) + if (S->last_node) { blake2b_set_lastnode(S); - + } S->f[0] = -1; return 0; } @@ -333,7 +333,7 @@ int blake2b(uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen) { - blake2b_state S[1]; + CRYPTO_ALIGN(64) blake2b_state S[1]; /* Verify parameters */ if (NULL == in && inlen > 0) { @@ -371,7 +371,7 @@ blake2b_salt_personal(uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen, const void *salt, const void *personal) { - blake2b_state S[1]; + CRYPTO_ALIGN(64) blake2b_state S[1]; /* Verify parameters */ if (NULL == in && inlen > 0) { |