summaryrefslogtreecommitdiff
path: root/crypto/tcrypt.c
diff options
context:
space:
mode:
authorJoy Latten <latten@austin.ibm.com>2007-12-12 20:24:22 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2008-01-11 08:16:53 +1100
commit93cc74e078eed8735585e5687903727bcfbcc8b4 (patch)
tree6251899d3f904ab7a8498a23aed4086b5fb12261 /crypto/tcrypt.c
parent4a49b499dfa0c9e42be6d6fdd771f3434c776278 (diff)
downloadlinux-3.10-93cc74e078eed8735585e5687903727bcfbcc8b4.tar.gz
linux-3.10-93cc74e078eed8735585e5687903727bcfbcc8b4.tar.bz2
linux-3.10-93cc74e078eed8735585e5687903727bcfbcc8b4.zip
[CRYPTO] tcrypt: Add CCM vectors
This patch adds 7 test vectors to tcrypt for CCM. The test vectors are from rfc 3610. There are about 10 more test vectors in RFC 3610 and 4 or 5 more in NIST. I can add these as time permits. I also needed to set authsize. CCM has a prerequisite of authsize. Signed-off-by: Joy Latten <latten@austin.ibm.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/tcrypt.c')
-rw-r--r--crypto/tcrypt.c31
1 files changed, 29 insertions, 2 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 1142b4998c8..2b52df7bf83 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -266,8 +266,6 @@ static void test_aead(char *algo, int enc, struct aead_testvec *template,
return;
}
- authsize = crypto_aead_authsize(tfm);
-
req = aead_request_alloc(tfm, GFP_KERNEL);
if (!req) {
printk(KERN_INFO "failed to allocate request for %s\n", algo);
@@ -298,6 +296,15 @@ static void test_aead(char *algo, int enc, struct aead_testvec *template,
goto out;
}
+ authsize = abs(aead_tv[i].rlen - aead_tv[i].ilen);
+ ret = crypto_aead_setauthsize(tfm, authsize);
+ if (ret) {
+ printk(KERN_INFO
+ "failed to set authsize = %u\n",
+ authsize);
+ goto out;
+ }
+
sg_init_one(&sg[0], aead_tv[i].input,
aead_tv[i].ilen + (enc ? authsize : 0));
@@ -374,6 +381,15 @@ static void test_aead(char *algo, int enc, struct aead_testvec *template,
aead_tv[i].tap[k]);
}
+ authsize = abs(aead_tv[i].rlen - aead_tv[i].ilen);
+ ret = crypto_aead_setauthsize(tfm, authsize);
+ if (ret) {
+ printk(KERN_INFO
+ "failed to set authsize = %u\n",
+ authsize);
+ goto out;
+ }
+
if (enc)
sg[k - 1].length += authsize;
@@ -1201,6 +1217,10 @@ static void do_test(void)
AES_GCM_ENC_TEST_VECTORS);
test_aead("gcm(aes)", DECRYPT, aes_gcm_dec_tv_template,
AES_GCM_DEC_TEST_VECTORS);
+ test_aead("ccm(aes)", ENCRYPT, aes_ccm_enc_tv_template,
+ AES_CCM_ENC_TEST_VECTORS);
+ test_aead("ccm(aes)", DECRYPT, aes_ccm_dec_tv_template,
+ AES_CCM_DEC_TEST_VECTORS);
//CAST5
test_cipher("ecb(cast5)", ENCRYPT, cast5_enc_tv_template,
@@ -1557,6 +1577,13 @@ static void do_test(void)
LZO_COMP_TEST_VECTORS, LZO_DECOMP_TEST_VECTORS);
break;
+ case 37:
+ test_aead("ccm(aes)", ENCRYPT, aes_ccm_enc_tv_template,
+ AES_CCM_ENC_TEST_VECTORS);
+ test_aead("ccm(aes)", DECRYPT, aes_ccm_dec_tv_template,
+ AES_CCM_DEC_TEST_VECTORS);
+ break;
+
case 100:
test_hash("hmac(md5)", hmac_md5_tv_template,
HMAC_MD5_TEST_VECTORS);