[CRYPTO] ctr: Add countersize

This patch adds countersize to CTR mode.
The template is now ctr(algo,noncesize,ivsize,countersize).

For example, ctr(aes,4,8,4) indicates the counterblock
will be composed of a salt/nonce that is 4 bytes, an iv
that is 8 bytes and the counter is 4 bytes.

When noncesize + ivsize < blocksize, CTR initializes the
last block - ivsize - noncesize portion of the block to
zero.  Otherwise the counter block is composed of the IV
(and nonce if necessary).

If noncesize + ivsize == blocksize, then this indicates that
user is passing in entire counterblock. Thus countersize
indicates the amount of bytes in counterblock to use as
the counter for incrementing. CTR will increment counter
portion by 1, and begin encryption with that value.

Note that CTR assumes the counter portion of the block that
will be incremented is stored in big endian.

Signed-off-by: Joy Latten <latten@austin.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 4 insertions, 4 deletions

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 640cbcad32a1..aa84bc4f2313 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -969,9 +969,9 @@ static void do_test(void)
                             AES_XTS_ENC_TEST_VECTORS);
                 test_cipher("xts(aes)", DECRYPT, aes_xts_dec_tv_template,
                             AES_XTS_DEC_TEST_VECTORS);
-                test_cipher("ctr(aes,4,8)", ENCRYPT, aes_ctr_enc_tv_template,
+                test_cipher("ctr(aes,4,8,4)", ENCRYPT, aes_ctr_enc_tv_template,
                             AES_CTR_ENC_TEST_VECTORS);
-                test_cipher("ctr(aes,4,8)", DECRYPT, aes_ctr_dec_tv_template,
+                test_cipher("ctr(aes,4,8,4)", DECRYPT, aes_ctr_dec_tv_template,
                             AES_CTR_DEC_TEST_VECTORS);
 
                 //CAST5
@@ -1160,9 +1160,9 @@ static void do_test(void)
                             AES_XTS_ENC_TEST_VECTORS);
                 test_cipher("xts(aes)", DECRYPT, aes_xts_dec_tv_template,
                             AES_XTS_DEC_TEST_VECTORS);
-                test_cipher("ctr(aes,4,8)", ENCRYPT, aes_ctr_enc_tv_template,
+                test_cipher("ctr(aes,4,8,4)", ENCRYPT, aes_ctr_enc_tv_template,
                             AES_CTR_ENC_TEST_VECTORS);
-                test_cipher("ctr(aes,4,8)", DECRYPT, aes_ctr_dec_tv_template,
+                test_cipher("ctr(aes,4,8,4)", DECRYPT, aes_ctr_dec_tv_template,
                             AES_CTR_DEC_TEST_VECTORS);
                 break;