lib/util: Move memcmp_const_time() to util.c

This allows it to be used in more places without needing to introduce
more dependencies.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/util/util.c b/lib/util/util.c
index c066406d3208d81d6a4114717e1fdc2337bdce15..1cf3ff4e52501ed80fffb21bba744b37a1440304 100644 (file)
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -1097,6 +1097,18 @@ _PUBLIC_ size_t ascii_len_n(const char *src, size_t n)
        return len;
 }
 
+_PUBLIC_ int memcmp_const_time(const void *s1, const void *s2, size_t n)
+{
+       const uint8_t *p1 = s1, *p2 = s2;
+       size_t i, sum = 0;
+
+       for (i = 0; i < n; i++) {
+               sum |= (p1[i] ^ p2[i]);
+       }
+
+       return sum != 0;
+}
+
 struct anonymous_shared_header {
        union {
                size_t length;

diff --git a/lib/util/util_str.c b/lib/util/util_str.c
index b5ba3fb716be43ca52579b7c24a9a463d5165f40..721e7cc8644ced8788063fd39374a31e77b10d8e 100644 (file)
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -305,18 +305,6 @@ _PUBLIC_ bool set_boolean(const char *boolean_string, bool *boolean)
        return false;
 }
 
-_PUBLIC_ int memcmp_const_time(const void *s1, const void *s2, size_t n)
-{
-       const uint8_t *p1 = s1, *p2 = s2;
-       size_t i, sum = 0;
-
-       for (i = 0; i < n; i++) {
-               sum |= (p1[i] ^ p2[i]);
-       }
-
-       return sum != 0;
-}
-
 _PUBLIC_ void talloc_asprintf_addbuf(char **ps, const char *fmt, ...)
 {
        va_list ap;