crypto: testmgr - Add ctr(aes) test vectors

Now with multi-block test vectors, all from SP800-38A, Appendix F.5.
Also added ctr(aes) to case 10 in tcrypt.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 19 insertions, 4 deletions

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index c5550943411d..f4cc1780aee2 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1568,6 +1568,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "ctr(aes)",
+                .test = alg_test_skcipher,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = aes_ctr_enc_tv_template,
+                                        .count = AES_CTR_ENC_TEST_VECTORS
+                                },
+                                .dec = {
+                                        .vecs = aes_ctr_dec_tv_template,
+                                        .count = AES_CTR_DEC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
                 .alg = "cts(cbc(aes))",
                 .test = alg_test_skcipher,
                 .suite = {
@@ -2017,12 +2032,12 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .suite = {
                         .cipher = {
                                 .enc = {
-                                        .vecs = aes_ctr_enc_tv_template,
-                                        .count = AES_CTR_ENC_TEST_VECTORS
+                                        .vecs = aes_ctr_rfc3686_enc_tv_template,
+                                        .count = AES_CTR_3686_ENC_TEST_VECTORS
                                 },
                                 .dec = {
-                                        .vecs = aes_ctr_dec_tv_template,
-                                        .count = AES_CTR_DEC_TEST_VECTORS
+                                        .vecs = aes_ctr_rfc3686_dec_tv_template,
+                                        .count = AES_CTR_3686_DEC_TEST_VECTORS
                                 }
                         }
                 }