aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/tcrypt.c
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@iki.fi>2013-04-08 03:48:44 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2013-04-25 09:01:47 -0400
commit93b5e86a6d13c5dec18c6611933fb38d7d80f0d2 (patch)
treed30e88d098a44877a8701320f2a17073da37ff71 /crypto/tcrypt.c
parente448370d7377f064c2fef55f72e9b45184bf0926 (diff)
crypto: add CMAC support to CryptoAPI
Patch adds support for NIST recommended block cipher mode CMAC to CryptoAPI. This work is based on Tom St Denis' earlier patch, http://marc.info/?l=linux-crypto-vger&m=135877306305466&w=2 Cc: Tom St Denis <tstdenis@elliptictech.com> Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/tcrypt.c')
-rw-r--r--crypto/tcrypt.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 6b911ef8df8b..24ea7dffd21e 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -1095,7 +1095,6 @@ static int do_test(int m)
1095 break; 1095 break;
1096 1096
1097 case 28: 1097 case 28:
1098
1099 ret += tcrypt_test("tgr160"); 1098 ret += tcrypt_test("tgr160");
1100 break; 1099 break;
1101 1100
@@ -1118,6 +1117,7 @@ static int do_test(int m)
1118 ret += tcrypt_test("lrw(camellia)"); 1117 ret += tcrypt_test("lrw(camellia)");
1119 ret += tcrypt_test("xts(camellia)"); 1118 ret += tcrypt_test("xts(camellia)");
1120 break; 1119 break;
1120
1121 case 33: 1121 case 33:
1122 ret += tcrypt_test("sha224"); 1122 ret += tcrypt_test("sha224");
1123 break; 1123 break;
@@ -1213,6 +1213,7 @@ static int do_test(int m)
1213 case 109: 1213 case 109:
1214 ret += tcrypt_test("vmac(aes)"); 1214 ret += tcrypt_test("vmac(aes)");
1215 break; 1215 break;
1216
1216 case 110: 1217 case 110:
1217 ret += tcrypt_test("hmac(crc32)"); 1218 ret += tcrypt_test("hmac(crc32)");
1218 break; 1219 break;
@@ -1229,6 +1230,14 @@ static int do_test(int m)
1229 ret += tcrypt_test("rfc4543(gcm(aes))"); 1230 ret += tcrypt_test("rfc4543(gcm(aes))");
1230 break; 1231 break;
1231 1232
1233 case 153:
1234 ret += tcrypt_test("cmac(aes)");
1235 break;
1236
1237 case 154:
1238 ret += tcrypt_test("cmac(des3_ede)");
1239 break;
1240
1232 case 200: 1241 case 200:
1233 test_cipher_speed("ecb(aes)", ENCRYPT, sec, NULL, 0, 1242 test_cipher_speed("ecb(aes)", ENCRYPT, sec, NULL, 0,
1234 speed_template_16_24_32); 1243 speed_template_16_24_32);