[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/16] crypto/builtin: Remove odd-sized AES block handling
From: |
Richard Henderson |
Subject: |
[PATCH v2 10/16] crypto/builtin: Remove odd-sized AES block handling |
Date: |
Fri, 28 Aug 2020 10:05:17 -0700 |
We verified that the data block is properly sized modulo
AES_BLOCK_SIZE within qcrypto_builtin_cipher_{en,de}crypt.
Therefore we will never have to handle odd sized blocks.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
crypto/cipher-builtin.c.inc | 40 +++++++++++--------------------------
1 file changed, 12 insertions(+), 28 deletions(-)
diff --git a/crypto/cipher-builtin.c.inc b/crypto/cipher-builtin.c.inc
index 1444139f36..e2ae5d090c 100644
--- a/crypto/cipher-builtin.c.inc
+++ b/crypto/cipher-builtin.c.inc
@@ -80,21 +80,13 @@ static void qcrypto_cipher_aes_ecb_encrypt(const AES_KEY
*key,
{
const uint8_t *inptr = in;
uint8_t *outptr = out;
+
+ /* We have already verified that len % AES_BLOCK_SIZE == 0. */
while (len) {
- if (len > AES_BLOCK_SIZE) {
- AES_encrypt(inptr, outptr, key);
- inptr += AES_BLOCK_SIZE;
- outptr += AES_BLOCK_SIZE;
- len -= AES_BLOCK_SIZE;
- } else {
- uint8_t tmp1[AES_BLOCK_SIZE], tmp2[AES_BLOCK_SIZE];
- memcpy(tmp1, inptr, len);
- /* Fill with 0 to avoid valgrind uninitialized reads */
- memset(tmp1 + len, 0, sizeof(tmp1) - len);
- AES_encrypt(tmp1, tmp2, key);
- memcpy(outptr, tmp2, len);
- len = 0;
- }
+ AES_encrypt(inptr, outptr, key);
+ inptr += AES_BLOCK_SIZE;
+ outptr += AES_BLOCK_SIZE;
+ len -= AES_BLOCK_SIZE;
}
}
@@ -106,21 +98,13 @@ static void qcrypto_cipher_aes_ecb_decrypt(const AES_KEY
*key,
{
const uint8_t *inptr = in;
uint8_t *outptr = out;
+
+ /* We have already verified that len % AES_BLOCK_SIZE == 0. */
while (len) {
- if (len > AES_BLOCK_SIZE) {
- AES_decrypt(inptr, outptr, key);
- inptr += AES_BLOCK_SIZE;
- outptr += AES_BLOCK_SIZE;
- len -= AES_BLOCK_SIZE;
- } else {
- uint8_t tmp1[AES_BLOCK_SIZE], tmp2[AES_BLOCK_SIZE];
- memcpy(tmp1, inptr, len);
- /* Fill with 0 to avoid valgrind uninitialized reads */
- memset(tmp1 + len, 0, sizeof(tmp1) - len);
- AES_decrypt(tmp1, tmp2, key);
- memcpy(outptr, tmp2, len);
- len = 0;
- }
+ AES_decrypt(inptr, outptr, key);
+ inptr += AES_BLOCK_SIZE;
+ outptr += AES_BLOCK_SIZE;
+ len -= AES_BLOCK_SIZE;
}
}
--
2.25.1
- [PATCH v2 00/16] crypto/cipher: Class hierarchy cleanups, Richard Henderson, 2020/08/28
- [PATCH v2 01/16] crypto: Assume blocksize is a power of 2, Richard Henderson, 2020/08/28
- [PATCH v2 02/16] crypto: Rename cipher include files to .c.inc, Richard Henderson, 2020/08/28
- [PATCH v2 03/16] crypto: Remove redundant includes, Richard Henderson, 2020/08/28
- [PATCH v2 04/16] crypto/nettle: Fix xts_encrypt arguments, Richard Henderson, 2020/08/28
- [PATCH v2 05/16] crypto: Move QCryptoCipherDriver typedef to crypto/cipher.h, Richard Henderson, 2020/08/28
- [PATCH v2 06/16] crypto: Use the correct const type for driver, Richard Henderson, 2020/08/28
- [PATCH v2 07/16] crypto: Allocate QCryptoCipher with the subclass, Richard Henderson, 2020/08/28
- [PATCH v2 08/16] crypto: Move cipher->driver init to qcrypto_*_cipher_ctx_new, Richard Henderson, 2020/08/28
- [PATCH v2 09/16] crypto: Constify cipher data tables, Richard Henderson, 2020/08/28
- [PATCH v2 10/16] crypto/builtin: Remove odd-sized AES block handling,
Richard Henderson <=
- [PATCH v2 11/16] crypto/builtin: Merge qcrypto_cipher_aes_{ecb, xts}_{en, de}crypt, Richard Henderson, 2020/08/28
- [PATCH v2 12/16] crypto/builtin: Move AES_cbc_encrypt into cipher-builtin.inc.c, Richard Henderson, 2020/08/28
- [PATCH v2 13/16] crypto/builtin: Split and simplify AES_encrypt_cbc, Richard Henderson, 2020/08/28
- [PATCH v2 14/16] crypto/builtin: Split QCryptoCipherBuiltin into subclasses, Richard Henderson, 2020/08/28
- [PATCH v2 16/16] crypto/gcrypt: Split QCryptoCipherGcrypt into subclasses, Richard Henderson, 2020/08/28
- [PATCH v2 15/16] crypto/nettle: Split QCryptoCipherNettle into subclasses, Richard Henderson, 2020/08/28