cryb.to
/
cryb-to
mirror of https://github.com/cryb-to/cryb-to.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid any assumptions about the signedness of char.

This commit is contained in:
Dag-Erling Smørgrav 2017-04-21 18:56:52 +02:00
parent d03b4c1958
commit 938dcaa450
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/enc/cryb_base32_decode.c
View File

@ -36,7 +36,7 @@
#include <cryb/rfc4648.h>
static const char b32dec[256] = {
static const uint8_t b32dec[256] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@ -87,8 +87,9 @@ static const char b32dec[256] = {
* excess data, but returns the total amount.
*/
int
base32_decode(const char *in, size_t ilen, uint8_t *out, size_t *olen)
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;
@ -97,10 +98,10 @@ base32_decode(const char *in, size_t ilen, uint8_t *out, size_t *olen)
(padding && *in == '=')) {
/* consume */
continue;
} else if (!padding && b32dec[(uint8_t)*in] >= 0) {
} else if (!padding && b32dec[*in] != 0xff) {
/* shift into accumulator */
shift += 5;
bits = bits << 5 | b32dec[(uint8_t)*in];
bits = bits << 5 | b32dec[*in];
} else if (!padding && *in == '=' &&
(shift == 1 || shift == 2 || shift == 3 || shift == 4)) {
/* final byte */

9
lib/enc/cryb_base64_decode.c
View File

@ -36,7 +36,7 @@
#include <cryb/rfc4648.h>
static const char b64dec[256] = {
static const uint8_t b64dec[256] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@ -87,8 +87,9 @@ static const char b64dec[256] = {
* excess data, but returns the total amount.
*/
int
base64_decode(const char *in, size_t ilen, uint8_t *out, size_t *olen)
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;
@ -97,10 +98,10 @@ base64_decode(const char *in, size_t ilen, uint8_t *out, size_t *olen)
(padding && *in == '=')) {
/* consume */
continue;
} else if (!padding && b64dec[(uint8_t)*in] >= 0) {
} else if (!padding && b64dec[*in] != 0xff) {
/* shift into accumulator */
shift += 6;
bits = bits << 6 | b64dec[(uint8_t)*in];
bits = bits << 6 | b64dec[*in];
} else if (!padding && *in == '=' &&
(shift == 2 || shift == 4)) {
/* final byte */