From: Evan Hunt <each@isc.org>
Date: Thu, 6 Nov 2014 21:01:59 +0000 (-0800)
Subject: [master] s/mempcy/memmove/
X-Git-Tag: v9.11.0a1~1280
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=067c0c38e7ce3a2a86ab9ffa94802fbd3f4b03c0;p=thirdparty%2Fbind9.git

[master] s/mempcy/memmove/
---

diff --git a/bin/named/server.c b/bin/named/server.c
index 1158ef4ad8e..c650b3d79a5 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -9411,7 +9411,7 @@ generate_salt(unsigned char *salt, size_t saltlen) {
 	for (i = 0; i < n; i++)
 		isc_random_get(&rnd.rnd32[i]);
 
-	memcpy(salt, rnd.rnd, saltlen);
+	memmove(salt, rnd.rnd, saltlen);
 
 	r.base = rnd.rnd;
 	r.length = (unsigned int) saltlen;
diff --git a/lib/isc/random.c b/lib/isc/random.c
index 424e65b04a5..f7f7c7cdbfb 100644
--- a/lib/isc/random.c
+++ b/lib/isc/random.c
@@ -311,8 +311,8 @@ chacha_getuint16(isc_rng_t *rng) {
 	if (rng->have < sizeof(val))
 		chacha_rekey(rng, NULL, 0);
 
-	memcpy(&val, rng->buffer + CHACHA_BUFFERSIZE - rng->have,
-	       sizeof(val));
+	memmove(&val, rng->buffer + CHACHA_BUFFERSIZE - rng->have,
+		sizeof(val));
 	/* Clear the copied region. */
 	memset(rng->buffer + CHACHA_BUFFERSIZE - rng->have,
 	       0, sizeof(val));