Changeset 4703

Timestamp:

10/07/08 23:48:14 (5 years ago)

Author:

werner

Message:

Added generation of 128-bit keys with index > 0.

Location:

developers/werner/wep

Files:

• tests/foobar (modified) (1 diff)
• wep.c (modified) (1 diff)
• wepkey.c (modified) (1 diff)

developers/werner/wep/tests/foobar

@@ -11 +11 @@
 diff -u - _out <<EOF || fail
 49d68437b1ffb0db3fdf2d4a93
+a240f0feabe487bfcb2cfdb05b
+0c81b0bfab27187ea7b5467c63
+80b0656e46bc81e0627a046701
 a4beb3b8ec
 b697e900c8

developers/werner/wep/wep.c

@@ -43 +43 @@
         if (argc != 2)
                 usage(*argv);
-        dump(buf, wepkey_128(buf, sizeof(buf), argv[1], 0));
+        for (i = 0; i != 4; i++)
+                dump(buf, wepkey_128(buf, sizeof(buf), argv[1], i));
         for (i = 0; i != 4; i++)
                 dump(buf, wepkey_64(buf, sizeof(buf), argv[1], i));

developers/werner/wep/wepkey.c

@@ -30 +30 @@
 ssize_t wepkey_128(void *out, size_t size, const char *in, int n)
 {
+        const char extra[] = "#$%" "!@#" "%&^";
         MD5_CTX ctx;
         char buf[64];
         unsigned char tmp[16];
-        int len, i;
+        int len, i, j;
 
-        if (n)
-                abort(); /* not yet implemented */
         if (size < WEPKEY_128_BYTES)
                 return -1;
         len = strlen(in);
-        for (i = 0; i != sizeof(buf); i++)
-                buf[i] = in[i % len];
+        for (i = 0; i != sizeof(buf); i++) {
+                j = i % (len+n*3);
+                buf[i] = j < len ? in[j] : extra[j-len];
+        }
         MD5_Init(&ctx);
         MD5_Update(&ctx, buf, sizeof(buf));
         MD5_Final(tmp, &ctx);
-        memcpy(out, tmp, WEPKEY_128_BYTES);
+        memcpy(out, tmp+n, WEPKEY_128_BYTES);
         return WEPKEY_128_BYTES;
 }