lkml.org 
[lkml]   [2019]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5] crypto: gcm - restrict assoclen for rfc4543
    Date
    Based on seqiv, IPsec ESP and rfc4543/rfc4106 the assoclen can be 16 or
    20 bytes.

    From esp4/esp6, assoclen is sizeof IP Header. This includes spi, seq_no
    and extended seq_no, that is 8 or 12 bytes.
    In seqiv, to asscolen is added the IV size (8 bytes).
    Therefore, the assoclen, for rfc4543, should be restricted to 16 or 20
    bytes, as for rfc4106.

    Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
    Reviewed-by: Horia Geanta <horia.geanta@nxp.com>
    ---
    Changes since v4:
    - alignment.
    ---
    crypto/gcm.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/crypto/gcm.c b/crypto/gcm.c
    index 2f3b50f..7388420 100644
    --- a/crypto/gcm.c
    +++ b/crypto/gcm.c
    @@ -1034,12 +1034,14 @@ static int crypto_rfc4543_copy_src_to_dst(struct aead_request *req, bool enc)

    static int crypto_rfc4543_encrypt(struct aead_request *req)
    {
    - return crypto_rfc4543_crypt(req, true);
    + return crypto_ipsec_check_assoclen(req->assoclen) ?:
    + crypto_rfc4543_crypt(req, true);
    }

    static int crypto_rfc4543_decrypt(struct aead_request *req)
    {
    - return crypto_rfc4543_crypt(req, false);
    + return crypto_ipsec_check_assoclen(req->assoclen) ?:
    + crypto_rfc4543_crypt(req, false);
    }

    static int crypto_rfc4543_init_tfm(struct crypto_aead *tfm)
    --
    2.1.0
    \
     
     \ /
      Last update: 2019-08-02 10:48    [W:3.726 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site