From 7febdf0f3c9617216c02c4d2c813b14f44d0651a Mon Sep 17 00:00:00 2001 From: inoguchi Date: Sat, 22 Jan 2022 00:43:41 +0000 Subject: [PATCH] Use memmove instead of memcpy for overlapping memory CID 250936 251103 OK beck@ jsing@ millert@ tb@ --- lib/libcrypto/aes/aes_ige.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libcrypto/aes/aes_ige.c b/lib/libcrypto/aes/aes_ige.c index 16ef5612eb7..244a5a36bd6 100644 --- a/lib/libcrypto/aes/aes_ige.c +++ b/lib/libcrypto/aes/aes_ige.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aes_ige.c,v 1.7 2015/02/10 09:46:30 miod Exp $ */ +/* $OpenBSD: aes_ige.c,v 1.8 2022/01/22 00:43:41 inoguchi Exp $ */ /* ==================================================================== * Copyright (c) 2006 The OpenSSL Project. All rights reserved. * @@ -109,8 +109,8 @@ AES_ige_encrypt(const unsigned char *in, unsigned char *out, size_t length, in += AES_BLOCK_SIZE; out += AES_BLOCK_SIZE; } - memcpy(ivec, ivp->data, AES_BLOCK_SIZE); - memcpy(ivec + AES_BLOCK_SIZE, iv2p->data, AES_BLOCK_SIZE); + memmove(ivec, ivp->data, AES_BLOCK_SIZE); + memmove(ivec + AES_BLOCK_SIZE, iv2p->data, AES_BLOCK_SIZE); } else { aes_block_t tmp, tmp2; aes_block_t iv; @@ -161,8 +161,8 @@ AES_ige_encrypt(const unsigned char *in, unsigned char *out, size_t length, in += AES_BLOCK_SIZE; out += AES_BLOCK_SIZE; } - memcpy(ivec, ivp->data, AES_BLOCK_SIZE); - memcpy(ivec + AES_BLOCK_SIZE, iv2p->data, AES_BLOCK_SIZE); + memmove(ivec, ivp->data, AES_BLOCK_SIZE); + memmove(ivec + AES_BLOCK_SIZE, iv2p->data, AES_BLOCK_SIZE); } else { aes_block_t tmp, tmp2; aes_block_t iv; -- 2.20.1