summaryrefslogtreecommitdiff
path: root/common/lib/libc
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2013-06-24 04:21:19 +0000
committerriastradh <riastradh@NetBSD.org>2013-06-24 04:21:19 +0000
commitadfdcceb8aad478bc3c5692fb3aff045c0c8ef37 (patch)
treeee62fd1d002750ee339715e953885019cf401475 /common/lib/libc
parent8fcb059d64019ef3a03b90cb11f6c6d47aeeb6b9 (diff)
Replace consttime_bcmp/explicit_bzero by consttime_memequal/explicit_memset.
consttime_memequal is the same as the old consttime_bcmp. explicit_memset is to memset as explicit_bzero was to bcmp. Passes amd64 release and i386/ALL, but I'm sure I missed some spots, so please let me know.
Diffstat (limited to 'common/lib/libc')
-rw-r--r--common/lib/libc/string/consttime_memequal.c (renamed from common/lib/libc/string/consttime_bcmp.c)6
-rw-r--r--common/lib/libc/string/explicit_memset.c (renamed from common/lib/libc/string/explicit_bzero.c)8
2 files changed, 7 insertions, 7 deletions
diff --git a/common/lib/libc/string/consttime_bcmp.c b/common/lib/libc/string/consttime_memequal.c
index e6c0b31c17e..969e53295fe 100644
--- a/common/lib/libc/string/consttime_bcmp.c
+++ b/common/lib/libc/string/consttime_memequal.c
@@ -1,14 +1,14 @@
-/* $NetBSD: consttime_bcmp.c,v 1.1 2012/08/30 12:16:49 drochner Exp $ */
+/* $NetBSD: consttime_memequal.c,v 1.1 2013/06/24 04:21:19 riastradh Exp $ */
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
-#define consttime_bcmp __consttime_bcmp
+#define consttime_memequal __consttime_memequal
#else
#include <lib/libkern/libkern.h>
#endif
int
-consttime_bcmp(const void *b1, const void *b2, size_t len)
+consttime_memequal(const void *b1, const void *b2, size_t len)
{
const char *c1 = b1, *c2 = b2;
int res = 0;
diff --git a/common/lib/libc/string/explicit_bzero.c b/common/lib/libc/string/explicit_memset.c
index c34410cfdde..181cf188628 100644
--- a/common/lib/libc/string/explicit_bzero.c
+++ b/common/lib/libc/string/explicit_memset.c
@@ -1,8 +1,8 @@
-/* $NetBSD: explicit_bzero.c,v 1.1 2012/08/30 12:16:49 drochner Exp $ */
+/* $NetBSD: explicit_memset.c,v 1.1 2013/06/24 04:21:19 riastradh Exp $ */
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
-#define explicit_bzero __explicit_bzero
+#define explicit_memset __explicit_memset
#define explicit_memset_impl __explicit_memset_impl
#else
#include <lib/libkern/libkern.h>
@@ -15,8 +15,8 @@
void *(* volatile explicit_memset_impl)(void *, int, size_t) = memset;
void
-explicit_bzero(void *b, size_t len)
+explicit_memset(void *b, int c, size_t len)
{
- (*explicit_memset_impl)(b, 0, len);
+ (*explicit_memset_impl)(b, c, len);
}