Commit 66bceb5f authored by Andy Polyakov's avatar Andy Polyakov
Browse files

chacha/chacha_enc.c: harmonize counter width with subroutine name. 



_ctr32 in function name refers to 32-bit counter, but it was implementing
64-bit one. This didn't pose problem to EVP, but 64-bit counter was just
misleading.

RT#4512

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent b1ffe8db

crypto/chacha/chacha_enc.c

+7 −3
Original line number Diff line number Diff line
@@ -110,8 +110,12 @@ void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp, 
        inp += todo;

        len -= todo;



        /* advance counter */

        if (++input[12] == 0)

            input[13]++;

        /*

         * Advance 32-bit counter. Note that as subroutine is so to

         * say nonce-agnostic, this limited counter width doesn't

         * prevent caller from implementing wider counter. It would

         * simply take two calls split on counter overflow...

         */

        input[12]++;

    }

}