Implement a constant-time safe_mem_is_zero.

diff --git a/src/common/di_ops.c b/src/common/di_ops.c
index b73a3cc4924c5b3eb03bd2ddf529169651466679..e299e31507b4dd98c2f668c0a9e63043394d20ec 100644 (file)
--- a/src/common/di_ops.c
+++ b/src/common/di_ops.c
@@ -203,3 +203,20 @@ dimap_search(const di_digest256_map_t *map, const uint8_t *key,
   return (void *)result;
 }
 
+/**
+ * Return true iff the <b>sz</b> bytes at <b>mem</b> are all zero. Runs in
+ * time independent of the contents of <b>mem</b>.
+ */
+int
+safe_mem_is_zero(const void *mem, size_t sz)
+{
+  uint32_t total = 0;
+  const uint8_t *ptr = mem;
+
+  while (sz--) {
+    total |= *ptr++;
+  }
+
+  return 1 & ((total - 1) >> 8);
+}
+

diff --git a/src/common/di_ops.h b/src/common/di_ops.h
index a86f56c966eafb733c01e8fb37fde6e971b54cdb..144482811f4925b07f1bff6e3d2bc8c804dda6a5 100644 (file)
--- a/src/common/di_ops.h
+++ b/src/common/di_ops.h
@@ -27,6 +27,8 @@ int tor_memeq(const void *a, const void *b, size_t sz);
 #define fast_memeq(a,b,c)  (0==memcmp((a),(b),(c)))
 #define fast_memneq(a,b,c) (0!=memcmp((a),(b),(c)))
 
+int safe_mem_is_zero(const void *mem, size_t sz);
+
 /** A type for a map from DIGEST256_LEN-byte blobs to void*, such that
  * data lookups take an amount of time proportional only to the size
  * of the map, and not to the position or presence of the item in the map.

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 04ca42dcd923ca0c1d140a09a699b333022d5ebc..f949c6db91df645fca400f60945e204cb602c86d 100644 (file)
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -2843,6 +2843,16 @@ test_util_di_ops(void)
     test_eq(neq1, !eq1);
   }
 
+  tt_int_op(1, ==, safe_mem_is_zero("", 0));
+  tt_int_op(1, ==, safe_mem_is_zero("", 1));
+  tt_int_op(0, ==, safe_mem_is_zero("a", 1));
+  tt_int_op(0, ==, safe_mem_is_zero("a", 2));
+  tt_int_op(0, ==, safe_mem_is_zero("\0a", 2));
+  tt_int_op(1, ==, safe_mem_is_zero("\0\0a", 2));
+  tt_int_op(1, ==, safe_mem_is_zero("\0\0\0\0\0\0\0\0", 8));
+  tt_int_op(1, ==, safe_mem_is_zero("\0\0\0\0\0\0\0\0a", 8));
+  tt_int_op(0, ==, safe_mem_is_zero("\0\0\0\0\0\0\0\0a", 9));
+
  done:
   ;
 }