---

yaml --- r: 344372 b: refs/heads/master c: 8163fc3 h: refs/heads/master v: v3
git-mirror · Oct 24, 2012 · 041e17a · 041e17a
1 parent 1757ebd
commit 041e17a
Show file tree

Hide file tree

Showing 4 changed files with 597 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3b9e8f6a4e8d0cc734fd95a980d021e0853d1fd
+refs/heads/master: 8163fc30d1316c3ecf6f88bc49b44af4aeb2dbf2
diff --git a/trunk/crypto/tcrypt.c b/trunk/crypto/tcrypt.c
@@ -971,6 +971,7 @@ static int do_test(int m)
 	case 3:
 		ret += tcrypt_test("ecb(des)");
 		ret += tcrypt_test("cbc(des)");
+		ret += tcrypt_test("ctr(des)");
 		break;
 
 	case 4:

diff --git a/trunk/crypto/testmgr.c b/trunk/crypto/testmgr.c
@@ -2335,6 +2335,21 @@ static const struct alg_test_desc alg_test_descs[] = {
 				}
 			}
 		}
+	}, {
+		.alg = "ctr(des)",
+		.test = alg_test_skcipher,
+		.suite = {
+			.cipher = {
+				.enc = {
+					.vecs = des_ctr_enc_tv_template,
+					.count = DES_CTR_ENC_TEST_VECTORS
+				},
+				.dec = {
+					.vecs = des_ctr_dec_tv_template,
+					.count = DES_CTR_DEC_TEST_VECTORS
+				}
+			}
+		}
 	}, {
 		.alg = "ctr(serpent)",
 		.test = alg_test_skcipher,
-Original file line number
+Diff line change
@@ Expand Up / @@ -971,6 +971,7 @@ static int do_test(int m) @@
     	case 3:
     		ret += tcrypt_test("ecb(des)");
     		ret += tcrypt_test("cbc(des)");
+    		ret += tcrypt_test("ctr(des)");
     		break;
     	case 4:
@@ Expand Down @@