X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fsec%2Futil.h;h=2fcf1b8f0926342ab5cabf30a80832fb83cc7538;hb=121f4d98bd4d74629809697ab66001ebcbac76ce;hp=189e4ed715858734fcac66a270cbd69bfd3713fb;hpb=456922ffd80d6dc65b7810f9fca98e56bc8f7d05;p=bertos.git

diff --git a/bertos/sec/util.h b/bertos/sec/util.h
index 189e4ed7..2fcf1b8f 100644
--- a/bertos/sec/util.h
+++ b/bertos/sec/util.h
@@ -1,6 +1,7 @@
 #ifndef SEC_UTIL_H
 #define SEC_UTIL_H
 
+#include <cfg/macros.h>
 #include <cfg/compiler.h>
 #include <cfg/debug.h>
 #include <string.h>
@@ -32,65 +33,91 @@
 void password2key(const char *pwd, size_t pwd_len,
 				  uint8_t *key, size_t key_len);
 
-/**
- * Perform a bitwise xor between \a in and \a inout, and store
- * the result into \a inout.
- */
-INLINE void xor_block(uint8_t *out, const uint8_t *in1, const uint8_t* in2, size_t len);
-
-/**
- * Perform a bitwise xor over \a inout with constant \a k.
- */
-INLINE void xor_block_const(uint8_t *out, const uint8_t *in, uint8_t k, size_t len);
-
-
-// FIXME: provide non-32bit fallback
-// FIXME: proper ifdef conditional
-#if 1 // 32-bit optimized versions
+INLINE void xor_block_8(uint8_t *out,
+		const uint8_t *in1, const uint8_t *in2, size_t len)
+{
+	while (len--)
+                *out++ = *in1++ ^ *in2++;
+}
 
-// FIXME: this code is currently buggy because it ignores alignment issues.
-INLINE void xor_block(uint8_t *out, const uint8_t *in1, const uint8_t* in2, size_t len)
+INLINE void xor_block_const_8(uint8_t *out,
+			const uint8_t *in, uint8_t k, size_t len)
 {
-	ASSERT(((size_t)in1 % 4) == 0);
-	ASSERT(((size_t)in2 % 4) == 0);
-	ASSERT(((size_t)out % 4) == 0);
+	while (len--)
+                *out++ = *in++ ^ k;
+}
 
-	const uint32_t *ibuf1 = (const uint32_t *)in1;
-	const uint32_t *ibuf2 = (const uint32_t *)in2;
-	uint32_t *obuf = (uint32_t *)out;
-	size_t rem = (len & 3);
+INLINE void xor_block_32(uint32_t *out, const uint32_t *in1,
+				const uint32_t *in2, size_t len)
+{
+	size_t rem = (len & (sizeof(uint32_t) - 1));
 
-	len /= 4;
+	len /= sizeof(uint32_t);
 	while (len--)
-		*obuf++ = *ibuf1++ ^ *ibuf2++;
-
-	in1 = (const uint8_t*)ibuf1;
-	in2 = (const uint8_t*)ibuf2;
-	out = (uint8_t*)obuf;
-	while (rem--)
 		*out++ = *in1++ ^ *in2++;
+	xor_block_8((uint8_t *)out,
+		(const uint8_t *)in1, (const uint8_t *)in2, rem);
 }
 
-INLINE void xor_block_const(uint8_t *out, const uint8_t *in, uint8_t k, size_t len)
+INLINE void xor_block_const_32(uint32_t *out, const uint32_t *in,
+					uint8_t k, size_t len)
 {
-	ASSERT(((size_t)in % 4) == 0);
-	ASSERT(((size_t)out % 4) == 0);
+	uint32_t k32 = k | ((uint32_t)k << 8) |
+			((uint32_t)k << 16) | ((uint32_t)k << 24);
+	size_t rem = (len & (sizeof(uint32_t) - 1));
 
-	uint32_t k32 = k | ((uint32_t)k<<8) | ((uint32_t)k<<16) | ((uint32_t)k<<24);
-	const uint32_t *ibuf = (const uint32_t *)in;
-	uint32_t *obuf = (uint32_t *)out;
-	size_t rem = (len & 3);
-
-	len /= 4;
+	len /= sizeof(uint32_t);
 	while (len--)
-		*obuf++ = *ibuf++ ^ k32;
+		*out++ = *in++ ^ k32;
+	xor_block_const_8((uint8_t *)out, (const uint8_t *)in, k, rem);
+}
 
-	in = (const uint8_t*)ibuf;
-	out = (uint8_t*)obuf;
-	while (rem--)
-		*out++ = *in++ ^ k;
+/**
+ * Perform a bitwise xor between \a in and \a inout, and store
+ * the result into \a inout.
+ */
+INLINE void xor_block(void *out, const void *in1, const void *in2, size_t len)
+{
+	if (is_aligned(out, sizeof(uint32_t)) &&
+			is_aligned(in1, sizeof(uint32_t)) &&
+			is_aligned(in2, sizeof(uint32_t)))
+	{
+		uint32_t *obuf = (uint32_t *)((size_t)out);
+		const uint32_t *ibuf1 = (const uint32_t *)((size_t)in1);
+		const uint32_t *ibuf2 = (const uint32_t *)((size_t)in2);
+
+		xor_block_32(obuf, ibuf1, ibuf2, len);
+	}
+	else
+	{
+		uint8_t *obuf = (uint8_t *)((size_t)out);
+		const uint8_t *ibuf1 = (const uint8_t *)((size_t)in1);
+		const uint8_t *ibuf2 = (const uint8_t *)((size_t)in2);
+
+		xor_block_8(obuf, ibuf1, ibuf2, len);
+	}
 }
 
-#endif
+/**
+ * Perform a bitwise xor over \a inout with constant \a k.
+ */
+INLINE void xor_block_const(uint8_t *out, const uint8_t *in, uint8_t k, size_t len)
+{
+	if (is_aligned(out, sizeof(uint32_t)) &&
+			is_aligned(in, sizeof(uint32_t)))
+	{
+		uint32_t *obuf = (uint32_t *)((size_t)out);
+		const uint32_t *ibuf = (const uint32_t *)((size_t)in);
+
+		xor_block_const_32(obuf, ibuf, k, len);
+	}
+	else
+	{
+		uint8_t *obuf = (uint8_t *)((size_t)out);
+		const uint8_t *ibuf = (const uint8_t *)((size_t)in);
+
+		xor_block_const_8(obuf, ibuf, k, len);
+	}
+}
 
 #endif /* SEC_UTIL_H */