lkml.org 
[lkml]   [2019]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 34/45] crypto: talitos - check AES key size
    Date
    From: Christophe Leroy <christophe.leroy@c-s.fr>

    commit 1ba34e71e9e56ac29a52e0d42b6290f3dc5bfd90 upstream.

    Although the HW accepts any size and silently truncates
    it to the correct length, the extra tests expects EINVAL
    to be returned when the key size is not valid.

    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    Fixes: 4de9d0b547b9 ("crypto: talitos - Add ablkcipher algorithms")
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/crypto/talitos.c | 14 ++++++++++++++
    1 file changed, 14 insertions(+)

    --- a/drivers/crypto/talitos.c
    +++ b/drivers/crypto/talitos.c
    @@ -1528,6 +1528,18 @@ static int ablkcipher_setkey(struct cryp
    return 0;
    }

    +static int ablkcipher_aes_setkey(struct crypto_ablkcipher *cipher,
    + const u8 *key, unsigned int keylen)
    +{
    + if (keylen == AES_KEYSIZE_128 || keylen == AES_KEYSIZE_192 ||
    + keylen == AES_KEYSIZE_256)
    + return ablkcipher_setkey(cipher, key, keylen);
    +
    + crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
    +
    + return -EINVAL;
    +}
    +
    static void common_nonsnoop_unmap(struct device *dev,
    struct talitos_edesc *edesc,
    struct ablkcipher_request *areq)
    @@ -2621,6 +2633,7 @@ static struct talitos_alg_template drive
    .min_keysize = AES_MIN_KEY_SIZE,
    .max_keysize = AES_MAX_KEY_SIZE,
    .ivsize = AES_BLOCK_SIZE,
    + .setkey = ablkcipher_aes_setkey,
    }
    },
    .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |
    @@ -2638,6 +2651,7 @@ static struct talitos_alg_template drive
    .min_keysize = AES_MIN_KEY_SIZE,
    .max_keysize = AES_MAX_KEY_SIZE,
    .ivsize = AES_BLOCK_SIZE,
    + .setkey = ablkcipher_aes_setkey,
    }
    },
    .desc_hdr_template = DESC_HDR_TYPE_AESU_CTR_NONSNOOP |

    \
     
     \ /
      Last update: 2019-09-18 08:22    [W:3.214 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site