diff options
Diffstat (limited to 'src/supplemental/base64/base64.c')
| -rw-r--r-- | src/supplemental/base64/base64.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/supplemental/base64/base64.c b/src/supplemental/base64/base64.c index 3f6d51b5..3c19ad8a 100644 --- a/src/supplemental/base64/base64.c +++ b/src/supplemental/base64/base64.c @@ -1,6 +1,6 @@ // // Copyright (c) 2014 Wirebird Labs LLC. All rights reserved. -// Copyright 2017 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech> // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), @@ -25,30 +25,30 @@ #include <ctype.h> -int +size_t nni_base64_decode(const char *in, size_t in_len, uint8_t *out, size_t out_len) { unsigned ii; - unsigned io; unsigned rem; uint32_t v; uint8_t ch; + size_t io; // Unrolled lookup of ASCII code points. // 0xFF represents a non-base64 valid character. - const uint8_t DECODEMAP[256] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + const uint8_t decode[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, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3E, 0xFF, 0xFF, - 0xFF, 0x3F, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0xFF, 0xFF, 0xFF, 0x3E, 0xFF, 0xFF, 0xFF, 0x00, - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, - 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, - 0x15, 0x16, 0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, - 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, - 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3E, 0xFF, 0xFF, 0xFF, + 0x3F, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, + 0x3D, 0xFF, 0xFF, 0xFF, 0x3E, 0xFF, 0xFF, 0xFF, 0x00, 0x01, + 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, + 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, + 0x16, 0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, + 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, + 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, @@ -61,7 +61,7 @@ nni_base64_decode(const char *in, size_t in_len, uint8_t *out, size_t out_len) 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; for (io = 0, ii = 0, v = 0, rem = 0; ii < in_len; ii++) { if (isspace(in[ii])) { @@ -72,53 +72,53 @@ nni_base64_decode(const char *in, size_t in_len, uint8_t *out, size_t out_len) break; } - ch = DECODEMAP[(int) (in[ii])]; + ch = decode[(int) (in[ii])]; // Discard invalid characters as per RFC 2045. if (ch == 0xFF) { break; } - v = (v << 6) | ch; + v = (v << 6u) | ch; rem += 6; if (rem >= 8) { rem -= 8; if (io >= out_len) return (-1); - out[io++] = (v >> rem) & 255; + out[io++] = (v >> rem) & 255u; } } if (rem >= 8) { rem -= 8; if (io >= out_len) return (-1); - out[io++] = (v >> rem) & 255; + out[io++] = (v >> rem) & 255u; } return (io); } -int +size_t nni_base64_encode(const uint8_t *in, size_t in_len, char *out, size_t out_len) { unsigned ii; - unsigned io; unsigned rem; uint32_t v; + size_t io; - const uint8_t ENCODEMAP[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789+/"; + const uint8_t encode[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/"; for (io = 0, ii = 0, v = 0, rem = 0; ii < in_len; ii++) { uint8_t ch = in[ii]; - v = (v << 8) | ch; + v = (v << 8u) | ch; rem += 8; while (rem >= 6) { rem -= 6; if (io >= out_len) return (-1); - out[io++] = ENCODEMAP[(v >> rem) & 63]; + out[io++] = encode[(v >> rem) & 63u]; } } @@ -126,11 +126,11 @@ nni_base64_encode(const uint8_t *in, size_t in_len, char *out, size_t out_len) v <<= (6 - rem); if (io >= out_len) return (-1); - out[io++] = ENCODEMAP[v & 63]; + out[io++] = encode[v & 63u]; } // Pad to a multiple of 3. - while (io & 3) { + while (io & 3u) { if (io >= out_len) return (-1); out[io++] = '='; |