commit bf8131f79f89c3939e3329676bd5c8b8f795e8f8
author Dr. Stephen Henson <steve@openssl.org> Fri Apr 15 11:30:19 2011 +0000
committer Dr. Stephen Henson <steve@openssl.org> Fri Apr 15 11:30:19 2011 +0000
tree bdc563d50b57f22ab075c2ff2bc3d7ac63463cce
parent 06b7e5a0e4ba613acdef51aaaa1b338a0c3e12b3

Add XTS selftest, include in fips_test_suite.

fips/fips_test_suite.c

diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c
index e71a693..e07b6d6 100644
--- a/fips/fips_test_suite.c
+++ b/fips/fips_test_suite.c
@@ -686,6 +686,8 @@
 	{NID_aes_192_cbc, "AES-192-CBC"},
 	{NID_aes_256_cbc, "AES-256-CBC"},
 	{NID_aes_128_ecb, "AES-128-ECB"},
+	{NID_aes_128_xts, "AES-128-XTS"},
+	{NID_aes_256_xts, "AES-256-XTS"},
 	{NID_des_ede3_cbc, "DES-EDE3-CBC"},
 	{NID_des_ede3_ecb, "DES-EDE3-ECB"},
 	{0, NULL}
@@ -753,12 +755,13 @@
 		idstr = "GCM";
 		break;
 
-		case FIPS_TEST_CCM:
-		idstr = "CCM";
+		case FIPS_TEST_XTS:
+		idstr = "XTS";
+		exstr = lookup_id(subid);
 		break;
 
-		case FIPS_TEST_XTS:
-		idstr = "HMAC";
+		case FIPS_TEST_CCM:
+		idstr = "CCM";
 		break;
 
 		case FIPS_TEST_X931:
@@ -849,6 +852,8 @@
 	    fail_sub = NID_aes_128_ecb;	
         } else if (!strcmp(argv[1], "aes-gcm")) {
 	    fail_id = FIPS_TEST_GCM;
+        } else if (!strcmp(argv[1], "aes-xts")) {
+	    fail_id = FIPS_TEST_XTS;
         } else if (!strcmp(argv[1], "des")) {
 	    fail_id = FIPS_TEST_CIPHER;
 	    fail_sub = NID_des_ede3_ecb;