cryb.to/cryb-to
1
0
Fork 0
mirror of https://github.com/cryb-to/cryb-to.git synced 2024-11-15 02:05:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix signed shift in base32 and base64 decoders.

Browse source
This commit is contained in:
Dag-Erling Smørgrav 2017-12-17 16:01:32 +01:00
parent 785612b12b
commit 5768034d36
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/enc/cryb_base32_decode.c
View file

@ -90,7 +90,7 @@ base32_decode(const char *cin, size_t ilen, uint8_t *out, size_t *olen)
{
const uint8_t *in = (const uint8_t *)cin;
size_t len;
int bits, shift, padding;
unsigned int bits, shift, padding;
for (bits = shift = padding = len = 0; ilen && *in; --ilen, ++in) {
if (*in == ' ' || *in == '\t' || *in == '\r' || *in == '\n' ||
@ -119,7 +119,7 @@ base32_decode(const char *cin, size_t ilen, uint8_t *out, size_t *olen)
}
}
/* non-zero bits in last byte before padding */
if (shift && (bits & ~(~0 << shift)) != 0) {
if (shift && (bits & ~(~0U << shift)) != 0) {
errno = EINVAL;
return (-1);
}

4
lib/enc/cryb_base64_decode.c
View file

@ -90,7 +90,7 @@ base64_decode(const char *cin, size_t ilen, uint8_t *out, size_t *olen)
{
const uint8_t *in = (const uint8_t *)cin;
size_t len;
int bits, shift, padding;
unsigned int bits, shift, padding;
for (bits = shift = padding = len = 0; ilen && *in; --ilen, ++in) {
if (*in == ' ' || *in == '\t' || *in == '\r' || *in == '\n' ||
@ -119,7 +119,7 @@ base64_decode(const char *cin, size_t ilen, uint8_t *out, size_t *olen)
}
}
/* non-zero bits in last byte before padding */
if (shift && (bits & ~(~0 << shift)) != 0) {
if (shift && (bits & ~(~0U << shift)) != 0) {
errno = EINVAL;
return (-1);
}