mirror of
https://github.com/jedisct1/libsodium.git
synced 2024-12-25 04:55:07 -07:00
Use uint instead of uint64_t for SHA* padding
Workaround for a clang bug
This commit is contained in:
parent
58fa4172a5
commit
5935cf7a7e
@ -153,10 +153,10 @@ static const uint8_t PAD[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|||||||
static void
|
static void
|
||||||
SHA256_Pad(crypto_hash_sha256_state *state, uint32_t tmp32[64 + 8])
|
SHA256_Pad(crypto_hash_sha256_state *state, uint32_t tmp32[64 + 8])
|
||||||
{
|
{
|
||||||
uint64_t r;
|
unsigned int r;
|
||||||
uint64_t i;
|
unsigned int i;
|
||||||
|
|
||||||
r = (state->count >> 3) & 0x3f;
|
r = (unsigned int) ((state->count >> 3) & 0x3f);
|
||||||
if (r < 56) {
|
if (r < 56) {
|
||||||
for (i = 0; i < 56 - r; i++) {
|
for (i = 0; i < 56 - r; i++) {
|
||||||
state->buf[r + i] = PAD[i];
|
state->buf[r + i] = PAD[i];
|
||||||
|
@ -172,10 +172,10 @@ static const uint8_t PAD[128] = {
|
|||||||
static void
|
static void
|
||||||
SHA512_Pad(crypto_hash_sha512_state *state, uint64_t tmp64[80 + 8])
|
SHA512_Pad(crypto_hash_sha512_state *state, uint64_t tmp64[80 + 8])
|
||||||
{
|
{
|
||||||
uint64_t r;
|
unsigned int r;
|
||||||
uint64_t i;
|
unsigned int i;
|
||||||
|
|
||||||
r = (state->count[1] >> 3) & 0x7f;
|
r = (unsigned int) ((state->count[1] >> 3) & 0x7f);
|
||||||
if (r < 112) {
|
if (r < 112) {
|
||||||
for (i = 0; i < 112 - r; i++) {
|
for (i = 0; i < 112 - r; i++) {
|
||||||
state->buf[r + i] = PAD[i];
|
state->buf[r + i] = PAD[i];
|
||||||
|
Loading…
Reference in New Issue
Block a user