• Ard Biesheuvel's avatar
    crypto: arm/chacha-neon - add missing counter increment · fd16931a
    Ard Biesheuvel authored
    Commit 86cd97ec ("crypto: arm/chacha-neon - optimize for non-block
    size multiples") refactored the chacha block handling in the glue code in
    a way that may result in the counter increment to be omitted when calling
    chacha_block_xor_neon() to process a full block. This violates the skcipher
    API, which requires that the output IV is suitable for handling more input
    as long as the preceding input has been presented in round multiples of the
    block size. Also, the same code is exposed via the chacha library interface
    whose callers may actually rely on this increment to occur even for final
    blocks that are smaller than the chacha block size.
    
    So increment the counter after calling chacha_block_xor_neon().
    
    Fixes: 86cd97ec ("crypto: arm/chacha-neon - optimize for non-block size multiples")
    Reported-by: default avatarEric Biggers <ebiggers@kernel.org>
    Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
    Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
    fd16931a
chacha-glue.c 9.45 KB