crypto: replace AES test vectors with NIST CAVP test data

NIST's Cryptographic Algorithm Validation Program provides
validation testing of FIPS-approved and NIST-recommended
cryptographic algorithms.

Instead of hard coding a limited set of test vectors, use
their comprehensive validation set to test AES cipher modes.

4 files changed, 97 insertions, 308 deletions

diff --git a/lib/crypto/test/Makefile b/lib/crypto/test/Makefile
index 5a81c84558..138081d386 100644
--- a/lib/crypto/test/Makefile
+++ b/lib/crypto/test/Makefile
@@ -77,6 +77,7 @@ release_spec:
 release_tests_spec: $(TEST_TARGET)
 	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) crypto.spec crypto.cover $(RELTEST_FILES) "$(RELSYSDIR)"
+	@tar cfh - crypto_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 	chmod -R u+w "$(RELSYSDIR)"
 
 release_docs_spec:
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 54bd729e7e..660ab80643 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -169,6 +169,10 @@ groups() ->
 
 %%-------------------------------------------------------------------
 init_per_suite(Config) ->
+    file:set_cwd(datadir(Config)),
+    {ok, _} = zip:unzip("KAT_AES.zip"),
+    {ok, _} = zip:unzip("aesmmt.zip"),
+
     try crypto:start() of
 	ok ->
 	    try crypto:strong_rand_bytes(1) of
@@ -628,10 +632,15 @@ block_cipher({Type, Key, IV, PlainText, CipherText}) ->
 block_cipher_increment({Type, Key, IV, PlainTexts})
   when Type == des_cbc; Type == aes_cbc; Type == des3_cbc ->
     block_cipher_increment(Type, Key, IV, IV, PlainTexts, iolist_to_binary(PlainTexts), []);
+block_cipher_increment({Type, Key, IV, PlainTexts, CipherText})
+  when Type == des_cbc; Type == des3_cbc ->
+    block_cipher_increment(Type, Key, IV, IV, PlainTexts, iolist_to_binary(PlainTexts), CipherText, []);
 block_cipher_increment({Type, Key, IV, PlainTexts, _CipherText}) when Type == aes_cbc ->
     Plain = iolist_to_binary(PlainTexts),
     Blocks = [iolistify(Block) || << Block:128/bitstring >> <= Plain],
     block_cipher_increment(Type, Key, IV, IV, Blocks, Plain, []);
+block_cipher_increment({_Type, _, _, _, _}) ->
+    ok;
 block_cipher_increment({_Type, _, _, _}) ->
     ok;
 block_cipher_increment({_,_,_}) ->
@@ -648,6 +657,17 @@ block_cipher_increment(Type, Key, IV0, IV, [PlainText | PlainTexts], Plain, Acc)
     CipherText = crypto:block_encrypt(Type, Key, IV, PlainText),
     NextIV = crypto:next_iv(Type, CipherText),
     block_cipher_increment(Type, Key, IV0, NextIV, PlainTexts, Plain, [CipherText | Acc]).
+block_cipher_increment(Type, Key, IV0, _IV, [], _Plain, CipherText, Acc) ->
+    case iolist_to_binary(lists:reverse(Acc)) of
+	CipherText ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto, block_decrypt, [Type, Key, IV0, CipherText]}, {expected, CipherText}, {got, Other}})
+    end;
+block_cipher_increment(Type, Key, IV0, IV, [PlainText | PlainTexts], Plain, CipherText, Acc) ->
+    CT = crypto:block_encrypt(Type, Key, IV, PlainText),
+    NextIV = crypto:next_iv(Type, CT),
+    block_cipher_increment(Type, Key, IV0, NextIV, PlainTexts, Plain, CipherText, [CT | Acc]).
 
 stream_cipher({Type, Key, PlainText}) ->
     Plain = iolist_to_binary(PlainText),
@@ -812,6 +832,8 @@ notsup(Fun, Args) ->
 hexstr2point(X, Y) ->
     <<4:8, (hexstr2bin(X))/binary, (hexstr2bin(Y))/binary>>.
 
+hexstr2bin(S) when is_binary(S) ->
+    list_to_binary(hexstr2list(binary_to_list(S)));
 hexstr2bin(S) ->
     list_to_binary(hexstr2list(S)).
 
@@ -1189,16 +1211,16 @@ group_config(aes_cbc256 = Type, Config) ->
     Pairs = cmac_nist(Type),
     [{block, Block}, {cmac, Pairs} | Config];
 group_config(aes_ecb, Config) ->
-    Block = aes_ecb(),
+    Block = aes_ecb(Config),
     [{block, Block} | Config];    
 group_config(aes_ige256, Config) ->
     Block = aes_ige256(),
     [{block, Block} | Config];
 group_config(aes_cfb8, Config) ->
-    Block = aes_cfb8(),
+    Block = aes_cfb8(Config),
     [{block, Block} | Config];
 group_config(aes_cfb128, Config) ->
-    Block = aes_cfb128(),
+    Block = aes_cfb128(Config),
     [{block, Block} | Config];
 group_config(blowfish_cbc, Config) ->
     Block = blowfish_cbc(),
@@ -1219,13 +1241,13 @@ group_config(aes_ctr, Config) ->
     Stream = aes_ctr(),
     [{stream, Stream} | Config];
 group_config(aes_gcm, Config) ->
-    AEAD = aes_gcm(),
+    AEAD = aes_gcm(Config),
     [{aead, AEAD} | Config];
 group_config(chacha20_poly1305, Config) ->
     AEAD = chacha20_poly1305(),
     [{aead, AEAD} | Config];
 group_config(aes_cbc, Config) ->
-    Block = aes_cbc(),
+    Block = aes_cbc(Config),
     [{block, Block} | Config];
 group_config(_, Config) ->
     Config.
@@ -1601,209 +1623,30 @@ rc2_cbc() ->
      }].
 
 %% AES CBC test vectors from http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
-aes_cbc() ->
-    [
-     %% F.2.1 CBC-AES128.Encrypt, F.2.2 CBC-AES128.Decrypt
-     {aes_cbc,
-      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),                    %% Key
-      hexstr2bin("000102030405060708090a0b0c0d0e0f"),                    %% IV
-      hexstr2bin("6bc1bee22e409f96e93d7e117393172a"                      %% PlainText
-		 "ae2d8a571e03ac9c9eb76fac45af8e51"
-		 "30c81c46a35ce411e5fbc1191a0a52ef"
-		 "f69f2445df4f9b17ad2b417be66c3710"),
-      hexstr2bin("7649abac8119b246cee98e9b12e9197d"                      %% CipherText
-		 "5086cb9b507219ee95db113a917678b2"
-		 "73bed6b8e3c1743b7116e69e22229516"
-		 "3ff1caa1681fac09120eca307586e1a7")},
-     %% F.2.3 CBC-AES192.Encrypt, F.2.4 CBC-AES192.Decrypt
-     {aes_cbc,
-      hexstr2bin("8e73b0f7da0e6452c810f32b809079e5"                      %% Key
-		 "62f8ead2522c6b7b"),
-      hexstr2bin("000102030405060708090a0b0c0d0e0f"),                    %% IV
-      hexstr2bin("6bc1bee22e409f96e93d7e117393172a"                      %% PlainText
-		 "ae2d8a571e03ac9c9eb76fac45af8e51"
-		 "30c81c46a35ce411e5fbc1191a0a52ef"
-		 "f69f2445df4f9b17ad2b417be66c3710"),
-      hexstr2bin("4f021db243bc633d7178183a9fa071e8"                      %% CipherText
-		 "b4d9ada9ad7dedf4e5e738763f69145a"
-		 "571b242012fb7ae07fa9baac3df102e0"
-		 "08b0e27988598881d920a9e64f5615cd")},
-     %% F.2.5 CBC-AES256.Encrypt, F.2.6 CBC-AES256.Decrypt
-     {aes_cbc,
-      hexstr2bin("603deb1015ca71be2b73aef0857d7781"                      %% Key
-		 "1f352c073b6108d72d9810a30914dff4"),
-      hexstr2bin("000102030405060708090a0b0c0d0e0f"),                    %% IV
-      hexstr2bin("6bc1bee22e409f96e93d7e117393172a"                      %% PlainText
-		 "ae2d8a571e03ac9c9eb76fac45af8e51"
-		 "30c81c46a35ce411e5fbc1191a0a52ef"
-		 "f69f2445df4f9b17ad2b417be66c3710"),
-      hexstr2bin("f58c4c04d6e5f1ba779eabfb5f7bfbd6"                      %% CipherText
-		 "9cfc4e967edb808d679f777bc6702c7d"
-		 "39f23369a9d9bacfa530e26304231461"
-		 "b2eb05e2c39be9fcda6c19078c6a9d1b")}
-    ].
-
-aes_cbc128() ->
-    [{aes_cbc128,
-      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-      hexstr2bin("000102030405060708090a0b0c0d0e0f"),
-      hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
-     {aes_cbc128,
-      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-      hexstr2bin("7649ABAC8119B246CEE98E9B12E9197D"),
-      hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
-     {aes_cbc128,
-      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-      hexstr2bin("5086CB9B507219EE95DB113A917678B2"),
-      hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
-     {aes_cbc128,
-      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-      hexstr2bin("73BED6B8E3C1743B7116E69E22229516"),
-      hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
-    ].
-
-aes_cbc256() -> 
-    [{aes_cbc256,
-      hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
-      hexstr2bin("000102030405060708090A0B0C0D0E0F"),
-      hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
-      {aes_cbc256,
-       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
-       hexstr2bin("F58C4C04D6E5F1BA779EABFB5F7BFBD6"),
-       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
-      {aes_cbc256,
-       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
-       hexstr2bin("9CFC4E967EDB808D679F777BC6702C7D"),
-       hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
-      {aes_cbc256,
-       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
-       hexstr2bin("39F23369A9D9BACFA530E26304231461"),
-       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
-     ].
-
-aes_ecb() -> 
-    [
-     {aes_ecb,
-      <<"YELLOW SUBMARINE">>, 
-      <<"YELLOW SUBMARINE">>},
-     {aes_ecb,
-      <<"0000000000000000">>, 
-      <<"0000000000000000">>},
-     {aes_ecb,
-      <<"FFFFFFFFFFFFFFFF">>, 
-      <<"FFFFFFFFFFFFFFFF">>},
-     {aes_ecb,
-      <<"3000000000000000">>, 
-      <<"1000000000000001">>},
-     {aes_ecb,
-      <<"1111111111111111">>, 
-      <<"1111111111111111">>},
-     {aes_ecb,
-      <<"0123456789ABCDEF">>, 
-      <<"1111111111111111">>},
-     {aes_ecb,
-      <<"0000000000000000">>, 
-      <<"0000000000000000">>},
-     {aes_ecb,
-      <<"FEDCBA9876543210">>, 
-      <<"0123456789ABCDEF">>},
-     {aes_ecb,
-      <<"7CA110454A1A6E57">>, 
-      <<"01A1D6D039776742">>},
-     {aes_ecb,
-      <<"0131D9619DC1376E">>, 
-      <<"5CD54CA83DEF57DA">>},
-     {aes_ecb,
-      <<"07A1133E4A0B2686">>, 
-      <<"0248D43806F67172">>},
-     {aes_ecb,
-      <<"3849674C2602319E">>, 
-      <<"51454B582DDF440A">>},
-     {aes_ecb,
-      <<"04B915BA43FEB5B6">>, 
-      <<"42FD443059577FA2">>},
-     {aes_ecb,
-      <<"0113B970FD34F2CE">>, 
-      <<"059B5E0851CF143A">>},
-     {aes_ecb,
-      <<"0170F175468FB5E6">>, 
-      <<"0756D8E0774761D2">>},
-     {aes_ecb,
-      <<"43297FAD38E373FE">>, 
-      <<"762514B829BF486A">>},
-     {aes_ecb,
-      <<"07A7137045DA2A16">>, 
-      <<"3BDD119049372802">>},
-     {aes_ecb,
-      <<"04689104C2FD3B2F">>, 
-      <<"26955F6835AF609A">>},
-     {aes_ecb,
-      <<"37D06BB516CB7546">>, 
-      <<"164D5E404F275232">>},
-     {aes_ecb,
-      <<"1F08260D1AC2465E">>, 
-      <<"6B056E18759F5CCA">>},
-     {aes_ecb,
-      <<"584023641ABA6176">>, 
-      <<"004BD6EF09176062">>},
-     {aes_ecb,
-      <<"025816164629B007">>, 
-      <<"480D39006EE762F2">>},
-     {aes_ecb,
-      <<"49793EBC79B3258F">>, 
-      <<"437540C8698F3CFA">>},
-     {aes_ecb,
-      <<"018310DC409B26D6">>, 
-      <<"1D9D5C5018F728C2">>},
-     {aes_ecb,
-      <<"1C587F1C13924FEF">>, 
-      <<"305532286D6F295A">>},
-     {aes_ecb,
-      <<"0101010101010101">>, 
-      <<"0123456789ABCDEF">>},
-     {aes_ecb,
-      <<"1F1F1F1F0E0E0E0E">>, 
-      <<"0123456789ABCDEF">>},
-     {aes_ecb,
-      <<"E0FEE0FEF1FEF1FE">>, 
-      <<"0123456789ABCDEF">>},
-     {aes_ecb,
-      <<"0000000000000000">>, 
-      <<"FFFFFFFFFFFFFFFF">>},
-     {aes_ecb,
-      <<"FFFFFFFFFFFFFFFF">>, 
-      <<"0000000000000000">>},
-     {aes_ecb,
-      <<"0123456789ABCDEF">>, 
-      <<"0000000000000000">>},
-     {aes_ecb,
-      <<"FEDCBA9876543210">>, 
-      <<"FFFFFFFFFFFFFFFF">>},
-     %% AES ECB test vectors from http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
-     %% F.1.1 ECB-AES128.Encrypt, F.1.2 ECB-AES128.Decrypt
-     {aes_ecb,
-      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),
-      hexstr2bin("6bc1bee22e409f96e93d7e117393172a"
-		 "ae2d8a571e03ac9c9eb76fac45af8e51"
-		 "30c81c46a35ce411e5fbc1191a0a52ef"
-		 "f69f2445df4f9b17ad2b417be66c3710")},
-     %% F.1.3 ECB-AES192.Encrypt, F.1.4 ECB-AES192.Decrypt
-     {aes_ecb,
-      hexstr2bin("8e73b0f7da0e6452c810f32b809079e5"
-		 "62f8ead2522c6b7b"),
-      hexstr2bin("6bc1bee22e409f96e93d7e117393172a"
-		 "ae2d8a571e03ac9c9eb76fac45af8e51"
-		 "30c81c46a35ce411e5fbc1191a0a52ef"
-		 "f69f2445df4f9b17ad2b417be66c3710")},
-     %% F.1.5 ECB-AES256.Encrypt, F.1.6 ECB-AES256.Decrypt
-     {aes_ecb,
-      hexstr2bin("603deb1015ca71be2b73aef0857d7781"
-		 "1f352c073b6108d72d9810a30914dff4"),
-      hexstr2bin("6bc1bee22e409f96e93d7e117393172a"
-		 "ae2d8a571e03ac9c9eb76fac45af8e51"
-		 "30c81c46a35ce411e5fbc1191a0a52ef"
-		 "f69f2445df4f9b17ad2b417be66c3710")}
-    ].
+aes_cbc(Config) ->
+   read_rsp(Config, aes_cbc,
+            ["CBCVarTxt128.rsp", "CBCVarKey128.rsp", "CBCGFSbox128.rsp", "CBCKeySbox128.rsp",
+             "CBCVarTxt192.rsp", "CBCVarKey192.rsp", "CBCGFSbox192.rsp", "CBCKeySbox192.rsp",
+             "CBCVarTxt256.rsp", "CBCVarKey256.rsp", "CBCGFSbox256.rsp", "CBCKeySbox256.rsp",
+             "CBCMMT128.rsp", "CBCMMT192.rsp", "CBCMMT256.rsp"
+            ]).
+
+aes_cbc128(Config) ->
+    read_rsp(Config, aes_cbc128,
+             ["CBCVarTxt128.rsp", "CBCVarKey128.rsp", "CBCGFSbox128.rsp", "CBCKeySbox128.rsp",
+              "CBCMMT128.rsp"]).
+
+aes_cbc256(Config) ->
+    read_rsp(Config, aes_cbc256,
+             ["CBCVarTxt256.rsp", "CBCVarKey256.rsp", "CBCGFSbox256.rsp", "CBCKeySbox256.rsp",
+              "CBCMMT256.rsp"]).
+
+aes_ecb(Config) ->
+    read_rsp(Config, aes_ecb,
+             ["ECBVarTxt128.rsp", "ECBVarKey128.rsp", "ECBGFSbox128.rsp", "ECBKeySbox128.rsp",
+              "ECBVarTxt192.rsp", "ECBVarKey192.rsp", "ECBGFSbox192.rsp", "ECBKeySbox192.rsp",
+              "ECBVarTxt256.rsp", "ECBVarKey256.rsp", "ECBGFSbox256.rsp", "ECBKeySbox256.rsp",
+              "ECBMMT128.rsp", "ECBMMT192.rsp", "ECBMMT256.rsp"]).
 
 aes_ige256() ->
     [{aes_ige256,
@@ -1824,107 +1667,19 @@ aes_ige256() ->
        hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
      ].
 
-aes_cfb8() -> 
-    [{aes_cfb8,
-      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-      hexstr2bin("000102030405060708090a0b0c0d0e0f"),
-      hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
-      {aes_cfb8,
-       hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-       hexstr2bin("3B3FD92EB72DAD20333449F8E83CFB4A"),
-       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
-      {aes_cfb8,
-       hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-       hexstr2bin("C8A64537A0B3A93FCDE3CDAD9F1CE58B"),
-       hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
-      {aes_cfb8,
-       hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-       hexstr2bin("26751F67A3CBB140B1808CF187A4F4DF"),
-       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")},
-      {aes_cfb8,
-       hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
-       hexstr2bin("000102030405060708090a0b0c0d0e0f"),
-       hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
-      {aes_cfb8,
-       hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
-       hexstr2bin("cdc80d6fddf18cab34c25909c99a4174"),
-       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
-      {aes_cfb8,
-       hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
-       hexstr2bin("67ce7f7f81173621961a2b70171d3d7a"),
-       hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
-      {aes_cfb8,
-       hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
-       hexstr2bin("2e1e8a1dd59b88b1c8e60fed1efac4c9"),
-       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")},
-      {aes_cfb8,
-       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
-       hexstr2bin("000102030405060708090a0b0c0d0e0f"),
-       hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
-      {aes_cfb8,
-       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
-       hexstr2bin("dc7e84bfda79164b7ecd8486985d3860"),
-       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
-      {aes_cfb8,
-       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
-       hexstr2bin("39ffed143b28b1c832113c6331e5407b"),
-       hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
-      {aes_cfb8,
-       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
-       hexstr2bin("df10132415e54b92a13ed0a8267ae2f9"),
-       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
-     ].
+aes_cfb8(Config) ->
+    read_rsp(Config, aes_cfb8,
+             ["CFB8VarTxt128.rsp", "CFB8VarKey128.rsp", "CFB8GFSbox128.rsp", "CFB8KeySbox128.rsp",
+              "CFB8VarTxt192.rsp", "CFB8VarKey192.rsp", "CFB8GFSbox192.rsp", "CFB8KeySbox192.rsp",
+              "CFB8VarTxt256.rsp", "CFB8VarKey256.rsp", "CFB8GFSbox256.rsp", "CFB8KeySbox256.rsp",
+              "CFB8MMT128.rsp", "CFB8MMT192.rsp", "CFB8MMT256.rsp"]).
 
-aes_cfb128() -> 
-    [{aes_cfb128,
-      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-      hexstr2bin("000102030405060708090a0b0c0d0e0f"),
-      hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
-      {aes_cfb128,
-       hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-       hexstr2bin("3B3FD92EB72DAD20333449F8E83CFB4A"),
-       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
-      {aes_cfb128,
-       hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-       hexstr2bin("C8A64537A0B3A93FCDE3CDAD9F1CE58B"),
-       hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
-      {aes_cfb128,
-       hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
-       hexstr2bin("26751F67A3CBB140B1808CF187A4F4DF"),
-       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")},
-      {aes_cfb128,
-       hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
-       hexstr2bin("000102030405060708090a0b0c0d0e0f"),
-       hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
-      {aes_cfb128,
-       hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
-       hexstr2bin("cdc80d6fddf18cab34c25909c99a4174"),
-       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
-      {aes_cfb128,
-       hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
-       hexstr2bin("67ce7f7f81173621961a2b70171d3d7a"),
-       hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
-      {aes_cfb128,
-       hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
-       hexstr2bin("2e1e8a1dd59b88b1c8e60fed1efac4c9"),
-       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")},
-      {aes_cfb128,
-       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
-       hexstr2bin("000102030405060708090a0b0c0d0e0f"),
-       hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
-      {aes_cfb128,
-       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
-       hexstr2bin("dc7e84bfda79164b7ecd8486985d3860"),
-       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
-      {aes_cfb128,
-       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
-       hexstr2bin("39ffed143b28b1c832113c6331e5407b"),
-       hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
-      {aes_cfb128,
-       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
-       hexstr2bin("df10132415e54b92a13ed0a8267ae2f9"),
-       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
-     ].
+aes_cfb128(Config) ->
+    read_rsp(Config, aes_cfb128,
+             ["CFB128VarTxt128.rsp", "CFB128VarKey128.rsp", "CFB128GFSbox128.rsp", "CFB128KeySbox128.rsp",
+              "CFB128VarTxt192.rsp", "CFB128VarKey192.rsp", "CFB128GFSbox192.rsp", "CFB128KeySbox192.rsp",
+              "CFB128VarTxt256.rsp", "CFB128VarKey256.rsp", "CFB128GFSbox256.rsp", "CFB128KeySbox256.rsp",
+              "CFB128MMT128.rsp", "CFB128MMT192.rsp", "CFB128MMT256.rsp"]).
 
 blowfish_cbc() ->
     [{blowfish_cbc,
@@ -2813,3 +2568,36 @@ int_to_bin_neg(-1, Ds=[MSB|_]) when MSB >= 16#80 ->
     list_to_binary(Ds);
 int_to_bin_neg(X,Ds) ->
     int_to_bin_neg(X bsr 8, [(X band 255)|Ds]).
+
+datadir(Config) ->
+    proplists:get_value(data_dir, Config).
+
+read_rsp(Config, Type, Files) ->
+    lists:reverse(
+      lists:foldl(
+        fun(FileName, AccIn) ->
+                AccOut = read_rsp_file(filename:join(datadir(Config), FileName),
+                                       Type, AccIn),
+                erlang:garbage_collect(),
+                AccOut
+        end, [], Files)).
+
+read_rsp_file(FileName, Type, Acc) ->
+    {ok, Raw} = file:read_file(FileName),
+    Split = binary:split(Raw, [<<"\r">>, <<"\n">>], [global, trim_all]),
+    parse_rsp(Type, Split, Acc).
+
+parse_rsp(_Type, [], Acc) ->
+    Acc;
+parse_rsp(_Type, [<<"DECRYPT">>|_], Acc) ->
+    Acc;
+%% AES format
+parse_rsp(Type, [<<"COUNT = ", _/binary>>,
+                 <<"KEY = ", Key/binary>>,
+                 <<"IV = ", IV/binary>>,
+                 <<"PLAINTEXT = ", PlainText/binary>>,
+                 <<"CIPHERTEXT = ", CipherText/binary>>|Next], Acc) ->
+    parse_rsp(Type, Next, [{Type, hexstr2bin(Key), hexstr2bin(IV),
+                            hexstr2bin(PlainText), hexstr2bin(CipherText)}|Acc]);
+parse_rsp(Type, [_|Next], Acc) ->
+    parse_rsp(Type, Next, Acc).
diff --git a/lib/crypto/test/crypto_SUITE_data/KAT_AES.zip b/lib/crypto/test/crypto_SUITE_data/KAT_AES.zip
new file mode 100644
index 0000000000..128a74c52e
--- /dev/null
+++ b/lib/crypto/test/crypto_SUITE_data/KAT_AES.zip
diff --git a/lib/crypto/test/crypto_SUITE_data/aesmmt.zip b/lib/crypto/test/crypto_SUITE_data/aesmmt.zip
new file mode 100644
index 0000000000..5024de1d06
--- /dev/null
+++ b/lib/crypto/test/crypto_SUITE_data/aesmmt.zip