aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/crypto/modes/wrap128.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2015-12-03 21:13:35 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2015-12-03 21:13:35 +0000
commit80815a778ec9d0fc06b0e000c4608da4b4f3a711 (patch)
treeade84397c16fe1b20cb2a441f603826e49c36cf2 /crypto/openssl/crypto/modes/wrap128.c
parentf0f6270c40f08bdfcc4a7ad439a2e92b6b47b09f (diff)
parent737d7e8d3945c206c037e139055821aa0c64bb8e (diff)
downloadsrc-80815a778ec9d0fc06b0e000c4608da4b4f3a711.tar.gz
src-80815a778ec9d0fc06b0e000c4608da4b4f3a711.zip
Merge OpenSSL 1.0.2e.
Notes
Notes: svn path=/head/; revision=291719
Diffstat (limited to 'crypto/openssl/crypto/modes/wrap128.c')
-rw-r--r--crypto/openssl/crypto/modes/wrap128.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssl/crypto/modes/wrap128.c b/crypto/openssl/crypto/modes/wrap128.c
index 4dcaf0326fa8..384978371af2 100644
--- a/crypto/openssl/crypto/modes/wrap128.c
+++ b/crypto/openssl/crypto/modes/wrap128.c
@@ -76,7 +76,7 @@ size_t CRYPTO_128_wrap(void *key, const unsigned char *iv,
return 0;
A = B;
t = 1;
- memcpy(out + 8, in, inlen);
+ memmove(out + 8, in, inlen);
if (!iv)
iv = default_iv;
@@ -113,7 +113,7 @@ size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
A = B;
t = 6 * (inlen >> 3);
memcpy(A, in, 8);
- memcpy(out, in + 8, inlen);
+ memmove(out, in + 8, inlen);
for (j = 0; j < 6; j++) {
R = out + inlen - 8;
for (i = 0; i < inlen; i += 8, t--, R -= 8) {