[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] crypto: assert cipher algorithm is always valid
From: |
P J P |
Subject: |
[Qemu-devel] [PATCH] crypto: assert cipher algorithm is always valid |
Date: |
Mon, 20 Feb 2017 16:53:07 +0530 |
From: Prasad J Pandit <address@hidden>
Crypto routines 'qcrypto_cipher_get_block_len' and
'qcrypto_cipher_get_key_len' return non-zero cipher block and key
lengths from static arrays 'alg_block_len[]' and 'alg_key_len[]'
respectively. Returning 'zero(0)' value from either of them would
likely lead to an error condition.
Signed-off-by: Prasad J Pandit <address@hidden>
---
crypto/cipher.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/crypto/cipher.c b/crypto/cipher.c
index 9ecaff7..5a96489 100644
--- a/crypto/cipher.c
+++ b/crypto/cipher.c
@@ -63,18 +63,14 @@ static bool mode_need_iv[QCRYPTO_CIPHER_MODE__MAX] = {
size_t qcrypto_cipher_get_block_len(QCryptoCipherAlgorithm alg)
{
- if (alg >= G_N_ELEMENTS(alg_key_len)) {
- return 0;
- }
+ assert(alg < G_N_ELEMENTS(alg_key_len));
return alg_block_len[alg];
}
size_t qcrypto_cipher_get_key_len(QCryptoCipherAlgorithm alg)
{
- if (alg >= G_N_ELEMENTS(alg_key_len)) {
- return 0;
- }
+ assert(alg < G_N_ELEMENTS(alg_key_len));
return alg_key_len[alg];
}
--
2.9.3
- [Qemu-devel] [PATCH] crypto: assert cipher algorithm is always valid,
P J P <=