r4705 - in developers/werner/wep: . tests
werner at docs.openmoko.org
werner at docs.openmoko.org
Wed Oct 8 07:17:13 CEST 2008
Author: werner
Date: 2008-10-08 07:17:05 +0200 (Wed, 08 Oct 2008)
New Revision: 4705
Modified:
developers/werner/wep/Makefile
developers/werner/wep/tests/Makefile
developers/werner/wep/wepkey.c
developers/werner/wep/wepkey.h
Log:
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/
Modified: developers/werner/wep/Makefile
===================================================================
--- developers/werner/wep/Makefile 2008-10-08 05:09:09 UTC (rev 4704)
+++ developers/werner/wep/Makefile 2008-10-08 05:17:05 UTC (rev 4705)
@@ -23,6 +23,7 @@
clean:
rm -f $(OBJS) .depend
+ $(MAKE) -C tests clean
spotless: clean
rm -f wep
Modified: developers/werner/wep/tests/Makefile
===================================================================
--- developers/werner/wep/tests/Makefile 2008-10-08 05:09:09 UTC (rev 4704)
+++ developers/werner/wep/tests/Makefile 2008-10-08 05:17:05 UTC (rev 4705)
@@ -1,7 +1,10 @@
.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:
rm -f _*
Modified: developers/werner/wep/wepkey.c
===================================================================
--- developers/werner/wep/wepkey.c 2008-10-08 05:09:09 UTC (rev 4704)
+++ developers/werner/wep/wepkey.c 2008-10-08 05:17:05 UTC (rev 4705)
@@ -27,35 +27,6 @@
#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;
-}
-
-
ssize_t wepkey_64(void *out, size_t size, const char *in, int n)
{
int len, i;
@@ -85,3 +56,32 @@
}
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;
+}
Modified: developers/werner/wep/wepkey.h
===================================================================
--- developers/werner/wep/wepkey.h 2008-10-08 05:09:09 UTC (rev 4704)
+++ developers/werner/wep/wepkey.h 2008-10-08 05:17:05 UTC (rev 4705)
@@ -22,8 +22,8 @@
#include <sys/types.h>
+#define WEPKEY_64_BYTES 5
#define WEPKEY_128_BYTES 13
-#define WEPKEY_64_BYTES 5
/*
@@ -31,7 +31,7 @@
* or 13 bytes, respectively. "n" is the key index, in the range 0...3.
*/
+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 */
More information about the commitlog
mailing list