cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Name similar things the same way in sodium_pad() and sodium_unpad()

Browse Source
This commit is contained in:
Frank Denis 2017-08-17 14:13:13 +02:00
parent fb4dc083e5
commit 4fd66e3ad7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsodium/sodium/utils.c
View File

@ -629,7 +629,7 @@ sodium_pad(size_t *padded_buflen_p, unsigned char *buf,
size_t xpadlen; size_t xpadlen;
size_t xpadded_len; size_t xpadded_len;
volatile unsigned char mask; volatile unsigned char mask;
unsigned char i_eq_xpad_mask; unsigned char barrier_mask;
if (blocksize <= 0U) { if (blocksize <= 0U) {
return -1; return -1;
@ -648,9 +648,9 @@ sodium_pad(size_t *padded_buflen_p, unsigned char *buf,
*padded_buflen_p = xpadded_len + 1U; *padded_buflen_p = xpadded_len + 1U;
mask = 0U; mask = 0U;
for (i = 0; i < blocksize; i++) { for (i = 0; i < blocksize; i++) {
i_eq_xpad_mask = (unsigned char) (((i ^ xpadlen) - 1U) >> 8); barrier_mask = (unsigned char) (((i ^ xpadlen) - 1U) >> 8);
tail[-i] = (tail[-i] & mask) | (0x80 & i_eq_xpad_mask); tail[-i] = (tail[-i] & mask) | (0x80 & barrier_mask);
mask |= i_eq_xpad_mask; mask |= barrier_mask;
} }
return 0; return 0;
} }