Changeset 3356 for pjproject/trunk/pjlib-util/src/pjlib-util-test/encryption.c

Timestamp:

Oct 26, 2010 11:53:28 PM (14 years ago)

Author:

bennylp

Message:

Fixed #1152 (The base64 decoder should ignore whitespaces in the input). In fact, the base64 decoder now will silently ignore/skip any bad characters.

File:

• pjproject/trunk/pjlib-util/src/pjlib-util-test/encryption.c (modified) (3 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util-test/encryption.c

@@ -495 +495 @@
 }
 
+enum
+{
+    ENCODE = 1,
+    DECODE = 2,
+    ENCODE_DECODE = 3
+};
 
 /*
@@ -503 +509 @@
     const char *base256;
     const char *base64;
+    unsigned flag;
 } base64_test_vec[] = 
 {
     {
         "",
-        ""
+        "",
+        ENCODE_DECODE
     },
     {
         "f",
-        "Zg=="
+        "Zg==",
+        ENCODE_DECODE
     },
     {
         "fo",
-        "Zm8="
+        "Zm8=",
+        ENCODE_DECODE
     },
     {
         "foo",
-        "Zm9v"
+        "Zm9v",
+        ENCODE_DECODE
     },
     {
         "foob",
-        "Zm9vYg=="
+        "Zm9vYg==",
+        ENCODE_DECODE
     },
     {
         "fooba",
         "Zm9vYmE=",
+        ENCODE_DECODE
     },
     {
         "foobar",
-        "Zm9vYmFy"
+        "Zm9vYmFy",
+        ENCODE_DECODE
     },
     {
         "\x14\xfb\x9c\x03\xd9\x7e",
-        "FPucA9l+"
+        "FPucA9l+",
+        ENCODE_DECODE
     },
     {
         "\x14\xfb\x9c\x03\xd9",
-        "FPucA9k="
+        "FPucA9k=",
+        ENCODE_DECODE
     },
     {
         "\x14\xfb\x9c\x03",
-        "FPucAw=="
-    }
+        "FPucAw==",
+        ENCODE_DECODE
+    },
+    /* with whitespaces */
+    {
+        "foobar",
+        "Zm9v\r\nYmFy",
+        DECODE
+    },
+    {
+        "foobar",
+        "\nZ\r\nm 9\tv\nYm\nF\ny\n",
+        DECODE
+    },
 };
 
@@ -557 +585 @@
 
     for (i=0; i<PJ_ARRAY_SIZE(base64_test_vec); ++i) {
+        pj_str_t input;
+        int out_len;
+
         /* Encode test */
-        pj_str_t input;
-        int out_len = sizeof(output);
-
-        rc = pj_base64_encode((pj_uint8_t*)base64_test_vec[i].base256, 
-                              strlen(base64_test_vec[i].base256),
-                              output, &out_len);
-        if (rc != PJ_SUCCESS)
-            return -90;
-
-        if (out_len != (int)strlen(base64_test_vec[i].base64))
-            return -91;
-
-        output[out_len] = '\0';
-        if (strcmp(output, base64_test_vec[i].base64) != 0)
-            return -92;
+        if (base64_test_vec[i].flag & ENCODE) {
+            out_len = sizeof(output);
+            rc = pj_base64_encode((pj_uint8_t*)base64_test_vec[i].base256,
+                                  strlen(base64_test_vec[i].base256),
+                                  output, &out_len);
+            if (rc != PJ_SUCCESS)
+                return -90;
+
+            if (out_len != (int)strlen(base64_test_vec[i].base64))
+                return -91;
+
+            output[out_len] = '\0';
+            if (strcmp(output, base64_test_vec[i].base64) != 0)
+                return -92;
+        }
 
         /* Decode test */
-        out_len = sizeof(output);
-        input.ptr = (char*)base64_test_vec[i].base64;
-        input.slen = strlen(base64_test_vec[i].base64);
-        rc = pj_base64_decode(&input, (pj_uint8_t*)output, &out_len);
-        if (rc != PJ_SUCCESS)
-            return -95;
-
-        if (out_len != (int)strlen(base64_test_vec[i].base256))
-            return -96;
-
-        output[out_len] = '\0';
-
-        if (strcmp(output, base64_test_vec[i].base256) != 0)
-            return -97;
+        if (base64_test_vec[i].flag & DECODE) {
+            out_len = sizeof(output);
+            input.ptr = (char*)base64_test_vec[i].base64;
+            input.slen = strlen(base64_test_vec[i].base64);
+            rc = pj_base64_decode(&input, (pj_uint8_t*)output, &out_len);
+            if (rc != PJ_SUCCESS)
+                return -95;
+
+            if (out_len != (int)strlen(base64_test_vec[i].base256))
+                return -96;
+
+            output[out_len] = '\0';
+
+            if (strcmp(output, base64_test_vec[i].base256) != 0)
+                return -97;
+        }
     }