diff options
Diffstat (limited to 'src/openvpn/base64.c')
| -rw-r--r-- | src/openvpn/base64.c | 144 |
1 files changed, 89 insertions, 55 deletions
diff --git a/src/openvpn/base64.c b/src/openvpn/base64.c index 258b258..c799ede 100644 --- a/src/openvpn/base64.c +++ b/src/openvpn/base64.c @@ -43,14 +43,14 @@ #include "memdbg.h" -static char base64_chars[] = +static char base64_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; /* * base64 encode input data of length size to malloced * buffer which is returned as *str. Returns string * length of *str. */ -int +int openvpn_base64_encode(const void *data, int size, char **str) { char *s, *p; @@ -59,44 +59,58 @@ openvpn_base64_encode(const void *data, int size, char **str) const unsigned char *q; if (size < 0) - return -1; + { + return -1; + } p = s = (char *) malloc(size * 4 / 3 + 4); if (p == NULL) - return -1; + { + return -1; + } q = (const unsigned char *) data; i = 0; - for (i = 0; i < size;) { - c = q[i++]; - c *= 256; - if (i < size) - c += q[i]; - i++; - c *= 256; - if (i < size) - c += q[i]; - i++; - p[0] = base64_chars[(c & 0x00fc0000) >> 18]; - p[1] = base64_chars[(c & 0x0003f000) >> 12]; - p[2] = base64_chars[(c & 0x00000fc0) >> 6]; - p[3] = base64_chars[(c & 0x0000003f) >> 0]; - if (i > size) - p[3] = '='; - if (i > size + 1) - p[2] = '='; - p += 4; + for (i = 0; i < size; ) { + c = q[i++]; + c *= 256; + if (i < size) + { + c += q[i]; + } + i++; + c *= 256; + if (i < size) + { + c += q[i]; + } + i++; + p[0] = base64_chars[(c & 0x00fc0000) >> 18]; + p[1] = base64_chars[(c & 0x0003f000) >> 12]; + p[2] = base64_chars[(c & 0x00000fc0) >> 6]; + p[3] = base64_chars[(c & 0x0000003f) >> 0]; + if (i > size) + { + p[3] = '='; + } + if (i > size + 1) + { + p[2] = '='; + } + p += 4; } *p = 0; *str = s; return strlen(s); } -static int +static int pos(char c) { char *p; for (p = base64_chars; *p; p++) - if (*p == c) - return p - base64_chars; + if (*p == c) + { + return p - base64_chars; + } return -1; } @@ -109,18 +123,28 @@ token_decode(const char *token) unsigned int val = 0; int marker = 0; if (!token[0] || !token[1] || !token[2] || !token[3]) - return DECODE_ERROR; + { + return DECODE_ERROR; + } for (i = 0; i < 4; i++) { - val *= 64; - if (token[i] == '=') - marker++; - else if (marker > 0) - return DECODE_ERROR; - else - val += pos(token[i]); + val *= 64; + if (token[i] == '=') + { + marker++; + } + else if (marker > 0) + { + return DECODE_ERROR; + } + else + { + val += pos(token[i]); + } } if (marker > 2) - return DECODE_ERROR; + { + return DECODE_ERROR; + } return (marker << 24) | val; } /* @@ -137,27 +161,37 @@ openvpn_base64_decode(const char *str, void *data, int size) q = data; if (size >= 0) - e = q + size; + { + e = q + size; + } for (p = str; *p && (*p == '=' || strchr(base64_chars, *p)); p += 4) { - unsigned int val = token_decode(p); - unsigned int marker = (val >> 24) & 0xff; - if (val == DECODE_ERROR) - return -1; - if (e && q >= e) - return -1; - *q++ = (val >> 16) & 0xff; - if (marker < 2) - { - if (e && q >= e) - return -1; - *q++ = (val >> 8) & 0xff; - } - if (marker < 1) - { - if (e && q >= e) - return -1; - *q++ = val & 0xff; - } + unsigned int val = token_decode(p); + unsigned int marker = (val >> 24) & 0xff; + if (val == DECODE_ERROR) + { + return -1; + } + if (e && q >= e) + { + return -1; + } + *q++ = (val >> 16) & 0xff; + if (marker < 2) + { + if (e && q >= e) + { + return -1; + } + *q++ = (val >> 8) & 0xff; + } + if (marker < 1) + { + if (e && q >= e) + { + return -1; + } + *q++ = val & 0xff; + } } return q - (unsigned char *) data; } |