haskal
/
iodine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

base32 now correct and test cleanup

This commit is contained in:
Bjorn Andersson 2007-01-28 01:07:51 +00:00
parent ec1ed45793
commit 0c8e398941
2 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/base32.c
View File

@ -111,20 +111,39 @@ decode_token(const char *t, char *data)
len = strlen(t);
data[0] = (len > 1) ? ((pos(t[0]) & 0x1f) << 3) |
((pos(t[1]) & 0x1c) >> 2) : '\0';
data[1] = (len > 2) ? ((pos(t[1]) & 0x03) << 6) |
((pos(t[2]) & 0x1f) << 1) |
((pos(t[3]) & 0x10) >> 4) : '\0';
data[2] = (len > 3) ? ((pos(t[3]) & 0x0f) << 4) |
((pos(t[4]) & 0x1e) >> 1) : '\0';
data[3] = (len > 4) ? ((pos(t[4]) & 0x01) << 7) |
((pos(t[5]) & 0x1f) << 2) |
((pos(t[6]) & 0x18) >> 3) : '\0';
data[4] = (len > 5) ? ((pos(t[6]) & 0x07) << 5) |
((pos(t[7]) & 0x1f)) : '\0';
if (len < 2)
return 0;
return (len > 5) ? 5 : len;
data[0] = ((pos(t[0]) & 0x1f) << 3) |
((pos(t[1]) & 0x1c) >> 2);
if (len < 4)
return 1;
data[1] = ((pos(t[1]) & 0x03) << 6) |
((pos(t[2]) & 0x1f) << 1) |
((pos(t[3]) & 0x10) >> 4);
if (len < 5)
return 2;
data[2] = ((pos(t[3]) & 0x0f) << 4) |
((pos(t[4]) & 0x1e) >> 1);
if (len < 7)
return 3;
data[3] = ((pos(t[4]) & 0x01) << 7) |
((pos(t[5]) & 0x1f) << 2) |
((pos(t[6]) & 0x18) >> 3);
if (len < 8)
return 4;
data[4] = ((pos(t[6]) & 0x07) << 5) |
((pos(t[7]) & 0x1f));
return 5;
}
int
@ -135,8 +154,8 @@ base32_decode(void **buf, size_t *buflen, const char *str)
const char *p;
char *newbuf;
int len;
newsize = strlen(str) * 5 / 8;
newsize = 5 * (strlen(str) / 8 + 4);
if (newsize > *buflen) {
if ((newbuf = realloc(*buf, newsize)) == NULL) {
free(*buf);
@ -153,6 +172,9 @@ base32_decode(void **buf, size_t *buflen, const char *str)
for (p = str; *p && strchr(cb32, *p); p += 8) {
len = decode_token(p, q);
q += len;
if (len < 5)
break;
}
*q = '\0';

36
tests/read.c
View File

@ -36,32 +36,26 @@
START_TEST(test_read_putshort)
{
short tshort;
short putted;
short temps;
char buf[4];
short *s;
unsigned short k;
unsigned short l;
char* p;
int i;
for (i = 0; i < 65536; i++) {
tshort = (unsigned short) i;
temps = htons(tshort);
p = buf;
putshort(&p, tshort);
s = &putted;
memcpy(s, buf, sizeof(short));
fail_unless(putted == temps,
va_str("Bad value on putshort for %d: %d != %d",
i, putted, temps));
s = &temps;
memcpy(buf, s, sizeof(short));
p = buf;
readshort(NULL, &p, &temps);
for (i = 0; i < 65535; i++) {
p = (char*)&k;
fail_unless(temps == tshort,
putshort(&p, i);
fail_unless(ntohs(k) == i,
va_str("Bad value on putshort for %d: %d != %d",
i, ntohs(k), i));
p = (char*)&k;
readshort(NULL, &p, &l);
fail_unless(l == i,
va_str("Bad value on readshort for %d: %d != %d",
i, temps, tshort));
i, l, i));
}
}
END_TEST