From a1fa5b86e2241a6409d3278ebc39dbc6a07fcae4 Mon Sep 17 00:00:00 2001
From: Kelly McLaughlin <kelly@kelly-mclaughlin.com>
Date: Fri, 30 Jan 2015 15:25:03 -0700
Subject: Accept all valid key sizes in aes_cfb functions

Despite the confusion caused by the name, aes_cfb_8_crypt and
aes_cfb_128_crypt can use key lengths of 128, 192, or 256. The integer
in the function name refers to the block size for CFB mode.  Change
the aes_cfb_8_crypt and aes_cfb_128_crypt functions to accept and use
keys of length 128, 192, or 256. Also augment the existing testing for
these functions using the NIST test vectors for the additional key
lengths to ensure the changes function properly.
---
 lib/crypto/test/crypto_SUITE.erl | 64 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

(limited to 'lib/crypto/test/crypto_SUITE.erl')

diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 03aa3964a5..53e29af338 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -1185,6 +1185,38 @@ aes_cfb8() ->
       {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")}
      ].
 
@@ -1204,6 +1236,38 @@ aes_cfb128() ->
       {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")}
      ].
 
-- 
cgit v1.2.3