Changeset eed52b

Timestamp:

02/17/09 21:22:24 (3 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

444299

Parents:

aad34d

git-author:

Erik Ekman <yarrick@…> (02/17/09 21:22:24)

git-committer:

Erik Ekman <erik@…> (02/04/12 20:34:00)

Message:

#51 handle one block encode/decode for base64

Files:

• src/base64.c (modified) (2 diffs)
• src/iodine.c (modified) (1 diff)
• tests/base64.c (modified) (2 diffs)

src/base64.c

@@ -96 +96 @@
 
         /* how many chars can we encode within the buf */
-        maxsize = BLKSIZE_RAW * (*buflen / BLKSIZE_ENC - 1) - 1;
+        maxsize = BLKSIZE_RAW * (*buflen / BLKSIZE_ENC);
         /* how big will the encoded data be */
-        newsize = BLKSIZE_ENC * (size / BLKSIZE_RAW + 1) + 1;
+        newsize = BLKSIZE_ENC * (size / BLKSIZE_RAW);
+        if (size % BLKSIZE_RAW) {
+                newsize += BLKSIZE_ENC;
+        }
+
         /* if the buffer is too small, eat some of the data */
         if (*buflen < newsize) {
@@ -121 +125 @@
         *buflen = size;
 
-        return strlen(buf) - 1;
+        return strlen(buf);
 }
 

src/iodine.c

@@ -141 +141 @@
         char *b;
 
-        space = MIN(0xFF, buflen) - strlen(topdomain) - 5;
+        space = MIN(0xFF, buflen) - strlen(topdomain) - 7;
         if (!encoder->places_dots())
                 space -= (space / 57); /* space for dots */

tests/base64.c

@@ -100 +100 @@
 END_TEST
 
+START_TEST(test_base64_blksize)
+{
+        size_t rawlen;
+        size_t enclen;
+        char *rawbuf;
+        char *encbuf;
+        struct encoder *b64;
+        int i;
+        int val;
+
+        b64 = get_base64_encoder();
+
+        rawlen = b64->blocksize_raw();
+        enclen = b64->blocksize_encoded();
+
+        rawbuf = malloc(rawlen + 16);
+        encbuf = malloc(enclen + 16);
+
+        for (i = 0; i < rawlen; i++) {
+                rawbuf[i] = 'A';
+        }
+        rawbuf[i] = 0;
+
+        val = b64->encode(encbuf, &enclen, rawbuf, rawlen);
+
+        fail_unless(rawlen == 3, "raw length was %d not 3", rawlen);
+        fail_unless(enclen == 3, "encoded %d bytes, not 3", enclen);
+        fail_unless(val == 4, "encoded string %s was length %d", encbuf, val);
+
+        memset(rawbuf, 0, rawlen + 16);
+
+        enclen = val;
+        val = b64->decode(rawbuf, &rawlen, encbuf, enclen);
+
+        fail_unless(rawlen == 3, "raw length was %d not 3", rawlen);
+        fail_unless(val == 3);
+        for (i = 0; i < rawlen; i++) {
+                fail_unless(rawbuf[i] == 'A');
+        }
+}
+END_TEST
+
 TCase *
 test_base64_create_tests()
@@ -108 +150 @@
         tcase_add_loop_test(tc, test_base64_encode, 0, TUPLES);
         tcase_add_loop_test(tc, test_base64_decode, 0, TUPLES);
+        tcase_add_test(tc, test_base64_blksize);
 
         return tc;