[CRYPTO] ctr: Refactor into ctr and rfc3686

As discussed previously, this patch moves the basic CTR functionality
into a chainable algorithm called ctr.  The IPsec-specific variant of
it is now placed on top with the name rfc3686.

So ctr(aes) gives a chainable cipher with IV size 16 while the IPsec
variant will be called rfc3686(ctr(aes)).  This patch also adjusts
gcm accordingly.

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 0cfb8ebb22ba..1142b4998c84 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -1193,9 +1193,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,4)", ENCRYPT, aes_ctr_enc_tv_template,
+                test_cipher("rfc3686(ctr(aes))", ENCRYPT, aes_ctr_enc_tv_template,
                             AES_CTR_ENC_TEST_VECTORS);
-                test_cipher("ctr(aes,4,8,4)", DECRYPT, aes_ctr_dec_tv_template,
+                test_cipher("rfc3686(ctr(aes))", DECRYPT, aes_ctr_dec_tv_template,
                             AES_CTR_DEC_TEST_VECTORS);
                 test_aead("gcm(aes)", ENCRYPT, aes_gcm_enc_tv_template,
                           AES_GCM_ENC_TEST_VECTORS);
@@ -1394,9 +1394,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,4)", ENCRYPT, aes_ctr_enc_tv_template,
+                test_cipher("rfc3686(ctr(aes))", ENCRYPT, aes_ctr_enc_tv_template,
                             AES_CTR_ENC_TEST_VECTORS);
-                test_cipher("ctr(aes,4,8,4)", DECRYPT, aes_ctr_dec_tv_template,
+                test_cipher("rfc3686(ctr(aes))", DECRYPT, aes_ctr_dec_tv_template,
                             AES_CTR_DEC_TEST_VECTORS);
                 break;