summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormikeb <mikeb@openbsd.org>2018-01-05 19:05:09 +0000
committermikeb <mikeb@openbsd.org>2018-01-05 19:05:09 +0000
commitf620fa076e23562ed1d435e0a6d20a2ba857f9de (patch)
tree8f9a9bdf1c8d14fff3a3e8877abdccbadff692e7
parentMake arm64 use the MI mplock implementation. Avoid <sys/mplock.h> being (diff)
downloadwireguard-openbsd-f620fa076e23562ed1d435e0a6d20a2ba857f9de.tar.xz
wireguard-openbsd-f620fa076e23562ed1d435e0a6d20a2ba857f9de.zip
Sync with the code in libc
OK millert; original commit message by tedu@: memcpy from the right place. at this point, the used variable is not relevant. from Mark Karpilovskij. ok millert
-rw-r--r--sys/crypto/siphash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/crypto/siphash.c b/sys/crypto/siphash.c
index 1b3df7e3f1d..33bb7b46325 100644
--- a/sys/crypto/siphash.c
+++ b/sys/crypto/siphash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: siphash.c,v 1.4 2017/04/12 18:35:50 florian Exp $ */
+/* $OpenBSD: siphash.c,v 1.5 2018/01/05 19:05:09 mikeb Exp $ */
/*-
* Copyright (c) 2013 Andre Oppermann <andre@FreeBSD.org>
@@ -102,7 +102,7 @@ SipHash_Update(SIPHASH_CTX *ctx, int rc, int rf, const void *src, size_t len)
}
if (len > 0)
- memcpy(&ctx->buf[used], ptr, len);
+ memcpy(ctx->buf, ptr, len);
}
void