Changeset 4705

Timestamp:

10/08/08 07:17:05 (5 years ago)

Author:

werner

Message:

Cleanup, part 2. Code move separated for clarity.

• wepkey.h, wepkey.c: reversed order of wepkey_64 and wepkey_128
• tests/Makefile (all): run all tests
• Makefile (clean): also clean up tests/

Location:

developers/werner/wep

Files:

• Makefile (modified) (1 diff)
• tests/Makefile (modified) (1 diff)
• wepkey.c (modified) (2 diffs)
• wepkey.h (modified) (2 diffs)

developers/werner/wep/Makefile

@@ -24 +24 @@
 clean:
                 rm -f $(OBJS) .depend
+                $(MAKE) -C tests clean
 
 spotless:       clean

developers/werner/wep/tests/Makefile

@@ -1 +1 @@
 .PHONY: tests clean
 
+# We list all lower-case letter explicitly to keep localization from messing
+# with us.
+
 all:
-        ./foobar
+        for n in [abcdefghijklmnopqrstuvwxyz]*; do ./$$n || exit; done
 
 clean:

developers/werner/wep/wepkey.c

@@ -26 +26 @@
 
 #include "wepkey.h"
-
-
-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, j;
-
-        if (size < WEPKEY_128_BYTES)
-                return -1;
-        if (n < 0 || n >= 4)
-                return -1;
-
-        len = strlen(in);
-        if (!len)
-                return -1;
-
-        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+n, WEPKEY_128_BYTES);
-        return WEPKEY_128_BYTES;
-}
 
 
@@ -86 +57 @@
         return WEPKEY_64_BYTES;
 }
+
+
+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, j;
+
+        if (size < WEPKEY_128_BYTES)
+                return -1;
+        if (n < 0 || n >= 4)
+                return -1;
+
+        len = strlen(in);
+        if (!len)
+                return -1;
+
+        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+n, WEPKEY_128_BYTES);
+        return WEPKEY_128_BYTES;
+}

developers/werner/wep/wepkey.h

@@ -23 +23 @@
 
 
+#define WEPKEY_64_BYTES         5
 #define WEPKEY_128_BYTES        13
-#define WEPKEY_64_BYTES         5
 
 
@@ -32 +32 @@
  */
 
+ssize_t wepkey_64(void *out, size_t size, const char *in, int n);
 ssize_t wepkey_128(void *out, size_t size, const char *in, int n);
-ssize_t wepkey_64(void *out, size_t size, const char *in, int n);
 
 #endif /* !WEPKEY_H */