Add XTS selftest, include in fips_test_suite.

6 files changed, 79 insertions, 5 deletions

diff --git a/crypto/fips_err.h b/crypto/fips_err.h
index 9a824c7306..b6c5c130a5 100644
--- a/crypto/fips_err.h
+++ b/crypto/fips_err.h
@@ -100,6 +100,7 @@ static ERR_STRING_DATA FIPS_str_functs[]=
 {ERR_FUNC(FIPS_F_FIPS_RAND_STATUS),	"FIPS_rand_status"},
 {ERR_FUNC(FIPS_F_FIPS_SELFTEST_AES),	"FIPS_selftest_aes"},
 {ERR_FUNC(FIPS_F_FIPS_SELFTEST_AES_GCM),	"FIPS_selftest_aes_gcm"},
+{ERR_FUNC(FIPS_F_FIPS_SELFTEST_AES_XTS),	"FIPS_selftest_aes_xts"},
 {ERR_FUNC(FIPS_F_FIPS_SELFTEST_CMAC),	"FIPS_selftest_cmac"},
 {ERR_FUNC(FIPS_F_FIPS_SELFTEST_DES),	"FIPS_selftest_des"},
 {ERR_FUNC(FIPS_F_FIPS_SELFTEST_DSA),	"FIPS_selftest_dsa"},
diff --git a/fips/aes/fips_aes_selftest.c b/fips/aes/fips_aes_selftest.c
index b84eda4a27..0205ac2f74 100644
--- a/fips/aes/fips_aes_selftest.c
+++ b/fips/aes/fips_aes_selftest.c
@@ -197,4 +197,68 @@ int FIPS_selftest_aes_gcm(void)
 
 	}
 
+
+static const unsigned char XTS_128_key[] = {
+	0xa1,0xb9,0x0c,0xba,0x3f,0x06,0xac,0x35,0x3b,0x2c,0x34,0x38,
+	0x76,0x08,0x17,0x62,0x09,0x09,0x23,0x02,0x6e,0x91,0x77,0x18,
+	0x15,0xf2,0x9d,0xab,0x01,0x93,0x2f,0x2f
+};
+static const unsigned char XTS_128_i[] = {
+	0x4f,0xae,0xf7,0x11,0x7c,0xda,0x59,0xc6,0x6e,0x4b,0x92,0x01,
+	0x3e,0x76,0x8a,0xd5
+};
+static const unsigned char XTS_128_pt[] = {
+	0xeb,0xab,0xce,0x95,0xb1,0x4d,0x3c,0x8d,0x6f,0xb3,0x50,0x39,
+	0x07,0x90,0x31,0x1c
+};
+static const unsigned char XTS_128_ct[] = {
+	0x77,0x8a,0xe8,0xb4,0x3c,0xb9,0x8d,0x5a,0x82,0x50,0x81,0xd5,
+	0xbe,0x47,0x1c,0x63
+};
+
+static const unsigned char XTS_256_key[] = {
+	0x1e,0xa6,0x61,0xc5,0x8d,0x94,0x3a,0x0e,0x48,0x01,0xe4,0x2f,
+	0x4b,0x09,0x47,0x14,0x9e,0x7f,0x9f,0x8e,0x3e,0x68,0xd0,0xc7,
+	0x50,0x52,0x10,0xbd,0x31,0x1a,0x0e,0x7c,0xd6,0xe1,0x3f,0xfd,
+	0xf2,0x41,0x8d,0x8d,0x19,0x11,0xc0,0x04,0xcd,0xa5,0x8d,0xa3,
+	0xd6,0x19,0xb7,0xe2,0xb9,0x14,0x1e,0x58,0x31,0x8e,0xea,0x39,
+	0x2c,0xf4,0x1b,0x08
+};
+static const unsigned char XTS_256_i[] = {
+	0xad,0xf8,0xd9,0x26,0x27,0x46,0x4a,0xd2,0xf0,0x42,0x8e,0x84,
+	0xa9,0xf8,0x75,0x64
+};
+static const unsigned char XTS_256_pt[] = {
+	0x2e,0xed,0xea,0x52,0xcd,0x82,0x15,0xe1,0xac,0xc6,0x47,0xe8,
+	0x10,0xbb,0xc3,0x64,0x2e,0x87,0x28,0x7f,0x8d,0x2e,0x57,0xe3,
+	0x6c,0x0a,0x24,0xfb,0xc1,0x2a,0x20,0x2e
+};
+static const unsigned char XTS_256_ct[] = {
+	0xcb,0xaa,0xd0,0xe2,0xf6,0xce,0xa3,0xf5,0x0b,0x37,0xf9,0x34,
+	0xd4,0x6a,0x9b,0x13,0x0b,0x9d,0x54,0xf0,0x7e,0x34,0xf3,0x6a,
+	0xf7,0x93,0xe8,0x6f,0x73,0xc6,0xd7,0xdb
+};
+
+int FIPS_selftest_aes_xts()
+	{
+	int ret = 1;
+	EVP_CIPHER_CTX ctx;
+	FIPS_cipher_ctx_init(&ctx);
+
+	if (fips_cipher_test(FIPS_TEST_XTS, &ctx, EVP_aes_128_xts(),
+				XTS_128_key, XTS_128_i, XTS_128_pt, XTS_128_ct,
+				sizeof(XTS_128_pt)) <= 0)
+		ret = 0;
+
+	if (fips_cipher_test(FIPS_TEST_XTS, &ctx, EVP_aes_256_xts(),
+				XTS_256_key, XTS_256_i, XTS_256_pt, XTS_256_ct,
+				sizeof(XTS_256_pt)) <= 0)
+		ret = 0;
+
+	FIPS_cipher_ctx_cleanup(&ctx);
+	if (ret == 0)
+		FIPSerr(FIPS_F_FIPS_SELFTEST_AES_XTS,FIPS_R_SELFTEST_FAILED);
+	return ret;
+	}
+
 #endif
diff --git a/fips/fips.h b/fips/fips.h
index ab16134a40..6d37db2477 100644
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -74,6 +74,7 @@ int FIPS_selftest_failed(void);
 void FIPS_selftest_check(void);
 int FIPS_selftest_sha1(void);
 int FIPS_selftest_aes_gcm(void);
+int FIPS_selftest_aes_xts(void);
 int FIPS_selftest_aes(void);
 int FIPS_selftest_des(void);
 int FIPS_selftest_rsa(void);
@@ -260,6 +261,7 @@ void ERR_load_FIPS_strings(void);
 #define FIPS_F_FIPS_RAND_STATUS				 127
 #define FIPS_F_FIPS_SELFTEST_AES			 128
 #define FIPS_F_FIPS_SELFTEST_AES_GCM			 129
+#define FIPS_F_FIPS_SELFTEST_AES_XTS			 144
 #define FIPS_F_FIPS_SELFTEST_CMAC			 130
 #define FIPS_F_FIPS_SELFTEST_DES			 131
 #define FIPS_F_FIPS_SELFTEST_DSA			 132
diff --git a/fips/fips_locl.h b/fips/fips_locl.h
index fba8db8b63..1b29176ae0 100644
--- a/fips/fips_locl.h
+++ b/fips/fips_locl.h
@@ -53,7 +53,7 @@
 extern "C" {
 #endif
 
-#define FIPS_MAX_CIPHER_TEST_SIZE	16
+#define FIPS_MAX_CIPHER_TEST_SIZE	32
 #define fips_load_key_component(key, comp, pre) \
 	key->comp = BN_bin2bn(pre##_##comp, sizeof(pre##_##comp), key->comp); \
 	if (!key->comp) \
diff --git a/fips/fips_post.c b/fips/fips_post.c
index a6d0cfeae6..831e5d011a 100644
--- a/fips/fips_post.c
+++ b/fips/fips_post.c
@@ -174,6 +174,8 @@ int FIPS_selftest(void)
 		rv = 0;
 	if (!FIPS_selftest_aes_gcm())
 		rv = 0;
+	if (!FIPS_selftest_aes_xts())
+		rv = 0;
 	if (!FIPS_selftest_des())
 		rv = 0;
 	if (!FIPS_selftest_rsa())
diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c
index e71a6930bc..e07b6d6162 100644
--- a/fips/fips_test_suite.c
+++ b/fips/fips_test_suite.c
@@ -686,6 +686,8 @@ POST_ID id_list[] = {
 	{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 @@ static int post_cb(int op, int id, int subid, void *ex)
 		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 @@ int main(int argc,char **argv)
 	    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;