diff options
author | Daiki Ueno <dueno@redhat.com> | 2019-11-06 12:07:24 +0100 |
---|---|---|
committer | Daiki Ueno <dueno@redhat.com> | 2019-11-06 12:07:24 +0100 |
commit | 1c2135506825ae80966fe2797613806916b7e3c0 (patch) | |
tree | 82f9f1bb9eaf736bddbaf1cfa058e4695c11a3e7 | |
parent | 03fe7c089122ec50231012df3a6bfbc4a464f229 (diff) | |
download | gnutls-1c2135506825ae80966fe2797613806916b7e3c0.tar.gz |
nettle: backport fixes to cfb8_decrypt
cfb8: don't truncate output IV if input is shorter than block size:
https://git.lysator.liu.se/nettle/nettle/commit/f4a9c842621baf5d71aa9cc3989851f44dc46861
Signed-off-by: Daiki Ueno <dueno@redhat.com>
-rw-r--r-- | lib/nettle/backport/cfb8.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/nettle/backport/cfb8.c b/lib/nettle/backport/cfb8.c index e9816feb78..1762192f44 100644 --- a/lib/nettle/backport/cfb8.c +++ b/lib/nettle/backport/cfb8.c @@ -110,10 +110,12 @@ cfb8_decrypt(const void *ctx, nettle_cipher_func *f, src += i; dst += i; - memcpy(buffer, buffer + block_size, block_size); - memcpy(buffer + block_size, src, - length < block_size ? length : block_size); - + if (i == block_size) + { + memcpy(buffer, buffer + block_size, block_size); + memcpy(buffer + block_size, src, + length < block_size ? length : block_size); + } } memcpy(iv, buffer + i, block_size); |