diff options
| -rw-r--r-- | xs_encdec.h | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/xs_encdec.h b/xs_encdec.h index 1ca9346..f6042e8 100644 --- a/xs_encdec.h +++ b/xs_encdec.h @@ -35,10 +35,13 @@ d_char *xs_hex_dec(const char *hex) /* decodes an hexdump into data */ { int sz = strlen(hex); - d_char *s; + d_char *s = NULL; char *p; int n; + if (sz % 2) + return s; + p = s = calloc(sz / 2, 1); for (n = 0; n < sz; n += 2) { @@ -63,34 +66,37 @@ d_char *xs_base64_enc(const char *data, int sz) { d_char *s; unsigned char *p; - int n; + char *i; + int bsz, n; static char *b64_tbl = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz" "0123456789+/"; - s = xs_str_new(NULL); + bsz = ((sz + 3 - 1) / 3) * 4; + i = s = calloc(bsz + 1, 1); p = (unsigned char *)data; for (n = 0; n < sz; n += 3) { int l = sz - n; if (l == 1) { - s = xs_append_m(s, &b64_tbl[(p[n] >> 2) & 0x3f], 1); - s = xs_append_m(s, &b64_tbl[(p[n] << 4) & 0x3f], 1); - s = xs_append_m(s, "==", 2); + *i++ = b64_tbl[(p[n] >> 2) & 0x3f]; + *i++ = b64_tbl[(p[n] << 4) & 0x3f]; + *i++ = '='; + *i++ = '='; } else if (l == 2) { - s = xs_append_m(s, &b64_tbl[(p[n] >> 2) & 0x3f], 1); - s = xs_append_m(s, &b64_tbl[(p[n] << 4 | p[n + 1] >> 4) & 0x3f], 1); - s = xs_append_m(s, &b64_tbl[(p[n + 1] << 2) & 0x3f], 1); - s = xs_append_m(s, "=", 1); + *i++ = b64_tbl[(p[n] >> 2) & 0x3f]; + *i++ = b64_tbl[(p[n] << 4 | p[n + 1] >> 4) & 0x3f]; + *i++ = b64_tbl[(p[n + 1] << 2) & 0x3f]; + *i++ = '='; } else { - s = xs_append_m(s, &b64_tbl[(p[n] >> 2) & 0x3f], 1); - s = xs_append_m(s, &b64_tbl[(p[n] << 4 | p[n + 1] >> 4) & 0x3f], 1); - s = xs_append_m(s, &b64_tbl[(p[n + 1] << 2 | p[n + 2] >> 6) & 0x3f], 1); - s = xs_append_m(s, &b64_tbl[(p[n + 2]) & 0x3f], 1); + *i++ = b64_tbl[(p[n] >> 2) & 0x3f]; + *i++ = b64_tbl[(p[n] << 4 | p[n + 1] >> 4) & 0x3f]; + *i++ = b64_tbl[(p[n + 1] << 2 | p[n + 2] >> 6) & 0x3f]; + *i++ = b64_tbl[(p[n + 2]) & 0x3f]; } } @@ -110,6 +116,10 @@ d_char *xs_base64_dec(const char *data, int *size) p = (char *)data; + /* size of data must be a multiple of 4 */ + if (strlen(p) % 4) + return s; + for (p = (char *)data; *p; p += 4) { int cs[4]; int n; |