Indent
This commit is contained in:
Frank Denis
parent
7a85ec9789
commit
99cf33bc8f
@ -70,20 +70,20 @@ be64enc(void *pp, uint64_t x)
|
|||||||
static void
|
static void
|
||||||
be64enc_vect(unsigned char *dst, const uint64_t *src, size_t len)
|
be64enc_vect(unsigned char *dst, const uint64_t *src, size_t len)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
for (i = 0; i < len / 8; i++) {
|
for (i = 0; i < len / 8; i++) {
|
||||||
be64enc(dst + i * 8, src[i]);
|
be64enc(dst + i * 8, src[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
be64dec_vect(uint64_t *dst, const unsigned char *src, size_t len)
|
be64dec_vect(uint64_t *dst, const unsigned char *src, size_t len)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
for (i = 0; i < len / 8; i++) {
|
for (i = 0; i < len / 8; i++) {
|
||||||
dst[i] = be64dec(src + i * 8);
|
dst[i] = be64dec(src + i * 8);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -96,117 +96,117 @@ be64dec_vect(uint64_t *dst, const unsigned char *src, size_t len)
|
|||||||
#define s0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x, 7))
|
#define s0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x, 7))
|
||||||
#define s1(x) (ROTR(x, 19) ^ ROTR(x, 61) ^ SHR(x, 6))
|
#define s1(x) (ROTR(x, 19) ^ ROTR(x, 61) ^ SHR(x, 6))
|
||||||
|
|
||||||
#define RND(a, b, c, d, e, f, g, h, k) \
|
#define RND(a, b, c, d, e, f, g, h, k) \
|
||||||
t0 = h + S1(e) + Ch(e, f, g) + k; \
|
t0 = h + S1(e) + Ch(e, f, g) + k; \
|
||||||
t1 = S0(a) + Maj(a, b, c); \
|
t1 = S0(a) + Maj(a, b, c); \
|
||||||
d += t0; \
|
d += t0; \
|
||||||
h = t0 + t1;
|
h = t0 + t1;
|
||||||
|
|
||||||
#define RNDr(S, W, i, k) \
|
#define RNDr(S, W, i, k) \
|
||||||
RND(S[(80 - i) % 8], S[(81 - i) % 8], \
|
RND(S[(80 - i) % 8], S[(81 - i) % 8], \
|
||||||
S[(82 - i) % 8], S[(83 - i) % 8], \
|
S[(82 - i) % 8], S[(83 - i) % 8], \
|
||||||
S[(84 - i) % 8], S[(85 - i) % 8], \
|
S[(84 - i) % 8], S[(85 - i) % 8], \
|
||||||
S[(86 - i) % 8], S[(87 - i) % 8], \
|
S[(86 - i) % 8], S[(87 - i) % 8], \
|
||||||
W[i] + k)
|
W[i] + k)
|
||||||
|
|
||||||
static void
|
static void
|
||||||
SHA512_Transform(uint64_t *state, const unsigned char block[128])
|
SHA512_Transform(uint64_t *state, const unsigned char block[128])
|
||||||
{
|
{
|
||||||
uint64_t W[80];
|
uint64_t W[80];
|
||||||
uint64_t S[8];
|
uint64_t S[8];
|
||||||
uint64_t t0, t1;
|
uint64_t t0, t1;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
be64dec_vect(W, block, 128);
|
be64dec_vect(W, block, 128);
|
||||||
for (i = 16; i < 80; i++) {
|
for (i = 16; i < 80; i++) {
|
||||||
W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16];
|
W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16];
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(S, state, 64);
|
memcpy(S, state, 64);
|
||||||
|
|
||||||
RNDr(S, W, 0, 0x428a2f98d728ae22ULL);
|
RNDr(S, W, 0, 0x428a2f98d728ae22ULL);
|
||||||
RNDr(S, W, 1, 0x7137449123ef65cdULL);
|
RNDr(S, W, 1, 0x7137449123ef65cdULL);
|
||||||
RNDr(S, W, 2, 0xb5c0fbcfec4d3b2fULL);
|
RNDr(S, W, 2, 0xb5c0fbcfec4d3b2fULL);
|
||||||
RNDr(S, W, 3, 0xe9b5dba58189dbbcULL);
|
RNDr(S, W, 3, 0xe9b5dba58189dbbcULL);
|
||||||
RNDr(S, W, 4, 0x3956c25bf348b538ULL);
|
RNDr(S, W, 4, 0x3956c25bf348b538ULL);
|
||||||
RNDr(S, W, 5, 0x59f111f1b605d019ULL);
|
RNDr(S, W, 5, 0x59f111f1b605d019ULL);
|
||||||
RNDr(S, W, 6, 0x923f82a4af194f9bULL);
|
RNDr(S, W, 6, 0x923f82a4af194f9bULL);
|
||||||
RNDr(S, W, 7, 0xab1c5ed5da6d8118ULL);
|
RNDr(S, W, 7, 0xab1c5ed5da6d8118ULL);
|
||||||
RNDr(S, W, 8, 0xd807aa98a3030242ULL);
|
RNDr(S, W, 8, 0xd807aa98a3030242ULL);
|
||||||
RNDr(S, W, 9, 0x12835b0145706fbeULL);
|
RNDr(S, W, 9, 0x12835b0145706fbeULL);
|
||||||
RNDr(S, W, 10, 0x243185be4ee4b28cULL);
|
RNDr(S, W, 10, 0x243185be4ee4b28cULL);
|
||||||
RNDr(S, W, 11, 0x550c7dc3d5ffb4e2ULL);
|
RNDr(S, W, 11, 0x550c7dc3d5ffb4e2ULL);
|
||||||
RNDr(S, W, 12, 0x72be5d74f27b896fULL);
|
RNDr(S, W, 12, 0x72be5d74f27b896fULL);
|
||||||
RNDr(S, W, 13, 0x80deb1fe3b1696b1ULL);
|
RNDr(S, W, 13, 0x80deb1fe3b1696b1ULL);
|
||||||
RNDr(S, W, 14, 0x9bdc06a725c71235ULL);
|
RNDr(S, W, 14, 0x9bdc06a725c71235ULL);
|
||||||
RNDr(S, W, 15, 0xc19bf174cf692694ULL);
|
RNDr(S, W, 15, 0xc19bf174cf692694ULL);
|
||||||
RNDr(S, W, 16, 0xe49b69c19ef14ad2ULL);
|
RNDr(S, W, 16, 0xe49b69c19ef14ad2ULL);
|
||||||
RNDr(S, W, 17, 0xefbe4786384f25e3ULL);
|
RNDr(S, W, 17, 0xefbe4786384f25e3ULL);
|
||||||
RNDr(S, W, 18, 0x0fc19dc68b8cd5b5ULL);
|
RNDr(S, W, 18, 0x0fc19dc68b8cd5b5ULL);
|
||||||
RNDr(S, W, 19, 0x240ca1cc77ac9c65ULL);
|
RNDr(S, W, 19, 0x240ca1cc77ac9c65ULL);
|
||||||
RNDr(S, W, 20, 0x2de92c6f592b0275ULL);
|
RNDr(S, W, 20, 0x2de92c6f592b0275ULL);
|
||||||
RNDr(S, W, 21, 0x4a7484aa6ea6e483ULL);
|
RNDr(S, W, 21, 0x4a7484aa6ea6e483ULL);
|
||||||
RNDr(S, W, 22, 0x5cb0a9dcbd41fbd4ULL);
|
RNDr(S, W, 22, 0x5cb0a9dcbd41fbd4ULL);
|
||||||
RNDr(S, W, 23, 0x76f988da831153b5ULL);
|
RNDr(S, W, 23, 0x76f988da831153b5ULL);
|
||||||
RNDr(S, W, 24, 0x983e5152ee66dfabULL);
|
RNDr(S, W, 24, 0x983e5152ee66dfabULL);
|
||||||
RNDr(S, W, 25, 0xa831c66d2db43210ULL);
|
RNDr(S, W, 25, 0xa831c66d2db43210ULL);
|
||||||
RNDr(S, W, 26, 0xb00327c898fb213fULL);
|
RNDr(S, W, 26, 0xb00327c898fb213fULL);
|
||||||
RNDr(S, W, 27, 0xbf597fc7beef0ee4ULL);
|
RNDr(S, W, 27, 0xbf597fc7beef0ee4ULL);
|
||||||
RNDr(S, W, 28, 0xc6e00bf33da88fc2ULL);
|
RNDr(S, W, 28, 0xc6e00bf33da88fc2ULL);
|
||||||
RNDr(S, W, 29, 0xd5a79147930aa725ULL);
|
RNDr(S, W, 29, 0xd5a79147930aa725ULL);
|
||||||
RNDr(S, W, 30, 0x06ca6351e003826fULL);
|
RNDr(S, W, 30, 0x06ca6351e003826fULL);
|
||||||
RNDr(S, W, 31, 0x142929670a0e6e70ULL);
|
RNDr(S, W, 31, 0x142929670a0e6e70ULL);
|
||||||
RNDr(S, W, 32, 0x27b70a8546d22ffcULL);
|
RNDr(S, W, 32, 0x27b70a8546d22ffcULL);
|
||||||
RNDr(S, W, 33, 0x2e1b21385c26c926ULL);
|
RNDr(S, W, 33, 0x2e1b21385c26c926ULL);
|
||||||
RNDr(S, W, 34, 0x4d2c6dfc5ac42aedULL);
|
RNDr(S, W, 34, 0x4d2c6dfc5ac42aedULL);
|
||||||
RNDr(S, W, 35, 0x53380d139d95b3dfULL);
|
RNDr(S, W, 35, 0x53380d139d95b3dfULL);
|
||||||
RNDr(S, W, 36, 0x650a73548baf63deULL);
|
RNDr(S, W, 36, 0x650a73548baf63deULL);
|
||||||
RNDr(S, W, 37, 0x766a0abb3c77b2a8ULL);
|
RNDr(S, W, 37, 0x766a0abb3c77b2a8ULL);
|
||||||
RNDr(S, W, 38, 0x81c2c92e47edaee6ULL);
|
RNDr(S, W, 38, 0x81c2c92e47edaee6ULL);
|
||||||
RNDr(S, W, 39, 0x92722c851482353bULL);
|
RNDr(S, W, 39, 0x92722c851482353bULL);
|
||||||
RNDr(S, W, 40, 0xa2bfe8a14cf10364ULL);
|
RNDr(S, W, 40, 0xa2bfe8a14cf10364ULL);
|
||||||
RNDr(S, W, 41, 0xa81a664bbc423001ULL);
|
RNDr(S, W, 41, 0xa81a664bbc423001ULL);
|
||||||
RNDr(S, W, 42, 0xc24b8b70d0f89791ULL);
|
RNDr(S, W, 42, 0xc24b8b70d0f89791ULL);
|
||||||
RNDr(S, W, 43, 0xc76c51a30654be30ULL);
|
RNDr(S, W, 43, 0xc76c51a30654be30ULL);
|
||||||
RNDr(S, W, 44, 0xd192e819d6ef5218ULL);
|
RNDr(S, W, 44, 0xd192e819d6ef5218ULL);
|
||||||
RNDr(S, W, 45, 0xd69906245565a910ULL);
|
RNDr(S, W, 45, 0xd69906245565a910ULL);
|
||||||
RNDr(S, W, 46, 0xf40e35855771202aULL);
|
RNDr(S, W, 46, 0xf40e35855771202aULL);
|
||||||
RNDr(S, W, 47, 0x106aa07032bbd1b8ULL);
|
RNDr(S, W, 47, 0x106aa07032bbd1b8ULL);
|
||||||
RNDr(S, W, 48, 0x19a4c116b8d2d0c8ULL);
|
RNDr(S, W, 48, 0x19a4c116b8d2d0c8ULL);
|
||||||
RNDr(S, W, 49, 0x1e376c085141ab53ULL);
|
RNDr(S, W, 49, 0x1e376c085141ab53ULL);
|
||||||
RNDr(S, W, 50, 0x2748774cdf8eeb99ULL);
|
RNDr(S, W, 50, 0x2748774cdf8eeb99ULL);
|
||||||
RNDr(S, W, 51, 0x34b0bcb5e19b48a8ULL);
|
RNDr(S, W, 51, 0x34b0bcb5e19b48a8ULL);
|
||||||
RNDr(S, W, 52, 0x391c0cb3c5c95a63ULL);
|
RNDr(S, W, 52, 0x391c0cb3c5c95a63ULL);
|
||||||
RNDr(S, W, 53, 0x4ed8aa4ae3418acbULL);
|
RNDr(S, W, 53, 0x4ed8aa4ae3418acbULL);
|
||||||
RNDr(S, W, 54, 0x5b9cca4f7763e373ULL);
|
RNDr(S, W, 54, 0x5b9cca4f7763e373ULL);
|
||||||
RNDr(S, W, 55, 0x682e6ff3d6b2b8a3ULL);
|
RNDr(S, W, 55, 0x682e6ff3d6b2b8a3ULL);
|
||||||
RNDr(S, W, 56, 0x748f82ee5defb2fcULL);
|
RNDr(S, W, 56, 0x748f82ee5defb2fcULL);
|
||||||
RNDr(S, W, 57, 0x78a5636f43172f60ULL);
|
RNDr(S, W, 57, 0x78a5636f43172f60ULL);
|
||||||
RNDr(S, W, 58, 0x84c87814a1f0ab72ULL);
|
RNDr(S, W, 58, 0x84c87814a1f0ab72ULL);
|
||||||
RNDr(S, W, 59, 0x8cc702081a6439ecULL);
|
RNDr(S, W, 59, 0x8cc702081a6439ecULL);
|
||||||
RNDr(S, W, 60, 0x90befffa23631e28ULL);
|
RNDr(S, W, 60, 0x90befffa23631e28ULL);
|
||||||
RNDr(S, W, 61, 0xa4506cebde82bde9ULL);
|
RNDr(S, W, 61, 0xa4506cebde82bde9ULL);
|
||||||
RNDr(S, W, 62, 0xbef9a3f7b2c67915ULL);
|
RNDr(S, W, 62, 0xbef9a3f7b2c67915ULL);
|
||||||
RNDr(S, W, 63, 0xc67178f2e372532bULL);
|
RNDr(S, W, 63, 0xc67178f2e372532bULL);
|
||||||
RNDr(S, W, 64, 0xca273eceea26619cULL);
|
RNDr(S, W, 64, 0xca273eceea26619cULL);
|
||||||
RNDr(S, W, 65, 0xd186b8c721c0c207ULL);
|
RNDr(S, W, 65, 0xd186b8c721c0c207ULL);
|
||||||
RNDr(S, W, 66, 0xeada7dd6cde0eb1eULL);
|
RNDr(S, W, 66, 0xeada7dd6cde0eb1eULL);
|
||||||
RNDr(S, W, 67, 0xf57d4f7fee6ed178ULL);
|
RNDr(S, W, 67, 0xf57d4f7fee6ed178ULL);
|
||||||
RNDr(S, W, 68, 0x06f067aa72176fbaULL);
|
RNDr(S, W, 68, 0x06f067aa72176fbaULL);
|
||||||
RNDr(S, W, 69, 0x0a637dc5a2c898a6ULL);
|
RNDr(S, W, 69, 0x0a637dc5a2c898a6ULL);
|
||||||
RNDr(S, W, 70, 0x113f9804bef90daeULL);
|
RNDr(S, W, 70, 0x113f9804bef90daeULL);
|
||||||
RNDr(S, W, 71, 0x1b710b35131c471bULL);
|
RNDr(S, W, 71, 0x1b710b35131c471bULL);
|
||||||
RNDr(S, W, 72, 0x28db77f523047d84ULL);
|
RNDr(S, W, 72, 0x28db77f523047d84ULL);
|
||||||
RNDr(S, W, 73, 0x32caab7b40c72493ULL);
|
RNDr(S, W, 73, 0x32caab7b40c72493ULL);
|
||||||
RNDr(S, W, 74, 0x3c9ebe0a15c9bebcULL);
|
RNDr(S, W, 74, 0x3c9ebe0a15c9bebcULL);
|
||||||
RNDr(S, W, 75, 0x431d67c49c100d4cULL);
|
RNDr(S, W, 75, 0x431d67c49c100d4cULL);
|
||||||
RNDr(S, W, 76, 0x4cc5d4becb3e42b6ULL);
|
RNDr(S, W, 76, 0x4cc5d4becb3e42b6ULL);
|
||||||
RNDr(S, W, 77, 0x597f299cfc657e2aULL);
|
RNDr(S, W, 77, 0x597f299cfc657e2aULL);
|
||||||
RNDr(S, W, 78, 0x5fcb6fab3ad6faecULL);
|
RNDr(S, W, 78, 0x5fcb6fab3ad6faecULL);
|
||||||
RNDr(S, W, 79, 0x6c44198c4a475817ULL);
|
RNDr(S, W, 79, 0x6c44198c4a475817ULL);
|
||||||
|
|
||||||
for (i = 0; i < 8; i++) {
|
for (i = 0; i < 8; i++) {
|
||||||
state[i] += S[i];
|
state[i] += S[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
sodium_memzero((void *) W, sizeof W);
|
sodium_memzero((void *) W, sizeof W);
|
||||||
@ -216,44 +216,44 @@ SHA512_Transform(uint64_t *state, const unsigned char block[128])
|
|||||||
}
|
}
|
||||||
|
|
||||||
static unsigned char PAD[128] = {
|
static unsigned char PAD[128] = {
|
||||||
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
||||||
};
|
};
|
||||||
|
|
||||||
static void
|
static void
|
||||||
SHA512_Pad(crypto_hash_sha512_state *state)
|
SHA512_Pad(crypto_hash_sha512_state *state)
|
||||||
{
|
{
|
||||||
unsigned char len[16];
|
unsigned char len[16];
|
||||||
uint64_t r, plen;
|
uint64_t r, plen;
|
||||||
|
|
||||||
be64enc_vect(len, state->count, 16);
|
be64enc_vect(len, state->count, 16);
|
||||||
|
|
||||||
r = (state->count[1] >> 3) & 0x7f;
|
r = (state->count[1] >> 3) & 0x7f;
|
||||||
plen = (r < 112) ? (112 - r) : (240 - r);
|
plen = (r < 112) ? (112 - r) : (240 - r);
|
||||||
crypto_hash_sha512_update(state, PAD, (unsigned long long) plen);
|
crypto_hash_sha512_update(state, PAD, (unsigned long long) plen);
|
||||||
|
|
||||||
crypto_hash_sha512_update(state, len, 16);
|
crypto_hash_sha512_update(state, len, 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
crypto_hash_sha512_init(crypto_hash_sha512_state *state)
|
crypto_hash_sha512_init(crypto_hash_sha512_state *state)
|
||||||
{
|
{
|
||||||
state->count[0] = state->count[1] = 0;
|
state->count[0] = state->count[1] = 0;
|
||||||
|
|
||||||
state->state[0] = 0x6a09e667f3bcc908ULL;
|
state->state[0] = 0x6a09e667f3bcc908ULL;
|
||||||
state->state[1] = 0xbb67ae8584caa73bULL;
|
state->state[1] = 0xbb67ae8584caa73bULL;
|
||||||
state->state[2] = 0x3c6ef372fe94f82bULL;
|
state->state[2] = 0x3c6ef372fe94f82bULL;
|
||||||
state->state[3] = 0xa54ff53a5f1d36f1ULL;
|
state->state[3] = 0xa54ff53a5f1d36f1ULL;
|
||||||
state->state[4] = 0x510e527fade682d1ULL;
|
state->state[4] = 0x510e527fade682d1ULL;
|
||||||
state->state[5] = 0x9b05688c2b3e6c1fULL;
|
state->state[5] = 0x9b05688c2b3e6c1fULL;
|
||||||
state->state[6] = 0x1f83d9abfb41bd6bULL;
|
state->state[6] = 0x1f83d9abfb41bd6bULL;
|
||||||
state->state[7] = 0x5be0cd19137e2179ULL;
|
state->state[7] = 0x5be0cd19137e2179ULL;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -263,35 +263,35 @@ crypto_hash_sha512_update(crypto_hash_sha512_state *state,
|
|||||||
const unsigned char *in,
|
const unsigned char *in,
|
||||||
unsigned long long inlen)
|
unsigned long long inlen)
|
||||||
{
|
{
|
||||||
uint64_t bitlen[2];
|
uint64_t bitlen[2];
|
||||||
uint64_t r;
|
uint64_t r;
|
||||||
const unsigned char *src = in;
|
const unsigned char *src = in;
|
||||||
|
|
||||||
r = (state->count[1] >> 3) & 0x7f;
|
r = (state->count[1] >> 3) & 0x7f;
|
||||||
|
|
||||||
bitlen[1] = ((uint64_t)inlen) << 3;
|
bitlen[1] = ((uint64_t)inlen) << 3;
|
||||||
bitlen[0] = ((uint64_t)inlen) >> 61;
|
bitlen[0] = ((uint64_t)inlen) >> 61;
|
||||||
|
|
||||||
if ((state->count[1] += bitlen[1]) < bitlen[1]) {
|
if ((state->count[1] += bitlen[1]) < bitlen[1]) {
|
||||||
state->count[0]++;
|
state->count[0]++;
|
||||||
}
|
}
|
||||||
state->count[0] += bitlen[0];
|
state->count[0] += bitlen[0];
|
||||||
|
|
||||||
if (inlen < 128 - r) {
|
if (inlen < 128 - r) {
|
||||||
memcpy(&state->buf[r], src, inlen);
|
memcpy(&state->buf[r], src, inlen);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
memcpy(&state->buf[r], src, 128 - r);
|
memcpy(&state->buf[r], src, 128 - r);
|
||||||
SHA512_Transform(state->state, state->buf);
|
SHA512_Transform(state->state, state->buf);
|
||||||
src += 128 - r;
|
src += 128 - r;
|
||||||
inlen -= 128 - r;
|
inlen -= 128 - r;
|
||||||
|
|
||||||
while (inlen >= 128) {
|
while (inlen >= 128) {
|
||||||
SHA512_Transform(state->state, src);
|
SHA512_Transform(state->state, src);
|
||||||
src += 128;
|
src += 128;
|
||||||
inlen -= 128;
|
inlen -= 128;
|
||||||
}
|
}
|
||||||
memcpy(state->buf, src, inlen);
|
memcpy(state->buf, src, inlen);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -300,8 +300,8 @@ int
|
|||||||
crypto_hash_sha512_final(crypto_hash_sha512_state *state,
|
crypto_hash_sha512_final(crypto_hash_sha512_state *state,
|
||||||
unsigned char *out)
|
unsigned char *out)
|
||||||
{
|
{
|
||||||
SHA512_Pad(state);
|
SHA512_Pad(state);
|
||||||
be64enc_vect(out, state->state, 64);
|
be64enc_vect(out, state->state, 64);
|
||||||
sodium_memzero((void *) state, sizeof *state);
|
sodium_memzero((void *) state, sizeof *state);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@ -319,4 +319,3 @@ crypto_hash(unsigned char *out, const unsigned char *in,
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user