346 files changed, 2 insertions, 2 deletions

diff --git a/test/cavp.py b/test/cavp.py
index 83dfa36..b5473eb 100644
--- a/test/cavp.py
+++ b/test/cavp.py
@@ -234,7 +234,7 @@ def _parse_args(args=None):
     parser.add_argument('--boxes', '-b', action='store_true', dest='use_boxes',
                         help='use the "boxes" interface')
     parser.add_argument('--archive', '-a', dest='archive_path', metavar='PATH',
-                        default=os.path.join(_script_dir, 'KAT_AES.zip'),
+                        default=os.path.join(_script_dir, 'data/KAT_AES.zip'),
                         help='set test vectors archive file path')
     parser.add_argument('--log', '-l', dest='log_path', metavar='PATH',
                         help='set log file path')
diff --git a/test/KAT_AES.zip b/test/data/KAT_AES.zip
index 128a74c..128a74c 100644
--- a/test/KAT_AES.zip
+++ b/test/data/KAT_AES.zip
diff --git a/test/file/.gitattributes b/test/data/file/.gitattributes
index d1e183e..d1e183e 100644
--- a/test/file/.gitattributes
+++ b/test/data/file/.gitattributes
diff --git a/test/file/aes128/cbc/blocksize-1.cipher b/test/data/file/aes128/cbc/blocksize-1.cipher
index 87401ab..87401ab 100644
--- a/test/file/aes128/cbc/blocksize-1.cipher
+++ b/test/data/file/aes128/cbc/blocksize-1.cipher
diff --git a/test/file/aes128/cbc/blocksize-1.iv b/test/data/file/aes128/cbc/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes128/cbc/blocksize-1.iv
+++ b/test/data/file/aes128/cbc/blocksize-1.iv
diff --git a/test/file/aes128/cbc/blocksize-1.key b/test/data/file/aes128/cbc/blocksize-1.key
index 65aef92..65aef92 100644
--- a/test/file/aes128/cbc/blocksize-1.key
+++ b/test/data/file/aes128/cbc/blocksize-1.key
diff --git a/test/file/aes128/cbc/blocksize-1.plain b/test/data/file/aes128/cbc/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes128/cbc/blocksize-1.plain
+++ b/test/data/file/aes128/cbc/blocksize-1.plain
diff --git a/test/file/aes128/cbc/blocksize.cipher b/test/data/file/aes128/cbc/blocksize.cipher
index db31f2b..db31f2b 100644
--- a/test/file/aes128/cbc/blocksize.cipher
+++ b/test/data/file/aes128/cbc/blocksize.cipher
diff --git a/test/file/aes128/cbc/blocksize.iv b/test/data/file/aes128/cbc/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes128/cbc/blocksize.iv
+++ b/test/data/file/aes128/cbc/blocksize.iv
diff --git a/test/file/aes128/cbc/blocksize.key b/test/data/file/aes128/cbc/blocksize.key
index d107b25..d107b25 100644
--- a/test/file/aes128/cbc/blocksize.key
+++ b/test/data/file/aes128/cbc/blocksize.key
diff --git a/test/file/aes128/cbc/blocksize.plain b/test/data/file/aes128/cbc/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes128/cbc/blocksize.plain
+++ b/test/data/file/aes128/cbc/blocksize.plain
diff --git a/test/file/aes128/cbc/empty1.cipher b/test/data/file/aes128/cbc/empty1.cipher
index b2e558d..b2e558d 100644
--- a/test/file/aes128/cbc/empty1.cipher
+++ b/test/data/file/aes128/cbc/empty1.cipher
diff --git a/test/file/aes128/cbc/empty1.iv b/test/data/file/aes128/cbc/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes128/cbc/empty1.iv
+++ b/test/data/file/aes128/cbc/empty1.iv
diff --git a/test/file/aes128/cbc/empty1.key b/test/data/file/aes128/cbc/empty1.key
index 445c724..445c724 100644
--- a/test/file/aes128/cbc/empty1.key
+++ b/test/data/file/aes128/cbc/empty1.key
diff --git a/test/file/aes128/cbc/empty1.plain b/test/data/file/aes128/cbc/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes128/cbc/empty1.plain
+++ b/test/data/file/aes128/cbc/empty1.plain
diff --git a/test/file/aes128/cbc/empty2.cipher b/test/data/file/aes128/cbc/empty2.cipher
index bb95345..bb95345 100644
--- a/test/file/aes128/cbc/empty2.cipher
+++ b/test/data/file/aes128/cbc/empty2.cipher
diff --git a/test/file/aes128/cbc/empty2.iv b/test/data/file/aes128/cbc/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes128/cbc/empty2.iv
+++ b/test/data/file/aes128/cbc/empty2.iv
diff --git a/test/file/aes128/cbc/empty2.key b/test/data/file/aes128/cbc/empty2.key
index 8bf836e..8bf836e 100644
--- a/test/file/aes128/cbc/empty2.key
+++ b/test/data/file/aes128/cbc/empty2.key
diff --git a/test/file/aes128/cbc/empty2.plain b/test/data/file/aes128/cbc/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes128/cbc/empty2.plain
+++ b/test/data/file/aes128/cbc/empty2.plain
diff --git a/test/file/aes128/cbc/random64k.cipher b/test/data/file/aes128/cbc/random64k.cipher
index 2844cdc..2844cdc 100644
--- a/test/file/aes128/cbc/random64k.cipher
+++ b/test/data/file/aes128/cbc/random64k.cipher
diff --git a/test/file/aes128/cbc/random64k.iv b/test/data/file/aes128/cbc/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes128/cbc/random64k.iv
+++ b/test/data/file/aes128/cbc/random64k.iv
diff --git a/test/file/aes128/cbc/random64k.key b/test/data/file/aes128/cbc/random64k.key
index dfb32f9..dfb32f9 100644
--- a/test/file/aes128/cbc/random64k.key
+++ b/test/data/file/aes128/cbc/random64k.key
diff --git a/test/file/aes128/cbc/random64k.plain b/test/data/file/aes128/cbc/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes128/cbc/random64k.plain
+++ b/test/data/file/aes128/cbc/random64k.plain
diff --git a/test/file/aes128/cbc/singlechar.cipher b/test/data/file/aes128/cbc/singlechar.cipher
index e6c41cc..e6c41cc 100644
--- a/test/file/aes128/cbc/singlechar.cipher
+++ b/test/data/file/aes128/cbc/singlechar.cipher
diff --git a/test/file/aes128/cbc/singlechar.iv b/test/data/file/aes128/cbc/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes128/cbc/singlechar.iv
+++ b/test/data/file/aes128/cbc/singlechar.iv
diff --git a/test/file/aes128/cbc/singlechar.key b/test/data/file/aes128/cbc/singlechar.key
index b1244a6..b1244a6 100644
--- a/test/file/aes128/cbc/singlechar.key
+++ b/test/data/file/aes128/cbc/singlechar.key
diff --git a/test/file/aes128/cbc/singlechar.plain b/test/data/file/aes128/cbc/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes128/cbc/singlechar.plain
+++ b/test/data/file/aes128/cbc/singlechar.plain
diff --git a/test/file/aes128/cfb/blocksize-1.cipher b/test/data/file/aes128/cfb/blocksize-1.cipher
index 1e482a8..1e482a8 100644
--- a/test/file/aes128/cfb/blocksize-1.cipher
+++ b/test/data/file/aes128/cfb/blocksize-1.cipher
diff --git a/test/file/aes128/cfb/blocksize-1.iv b/test/data/file/aes128/cfb/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes128/cfb/blocksize-1.iv
+++ b/test/data/file/aes128/cfb/blocksize-1.iv
diff --git a/test/file/aes128/cfb/blocksize-1.key b/test/data/file/aes128/cfb/blocksize-1.key
index 65aef92..65aef92 100644
--- a/test/file/aes128/cfb/blocksize-1.key
+++ b/test/data/file/aes128/cfb/blocksize-1.key
diff --git a/test/file/aes128/cfb/blocksize-1.plain b/test/data/file/aes128/cfb/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes128/cfb/blocksize-1.plain
+++ b/test/data/file/aes128/cfb/blocksize-1.plain
diff --git a/test/file/aes128/cfb/blocksize.cipher b/test/data/file/aes128/cfb/blocksize.cipher
index 4191a35..4191a35 100644
--- a/test/file/aes128/cfb/blocksize.cipher
+++ b/test/data/file/aes128/cfb/blocksize.cipher
diff --git a/test/file/aes128/cfb/blocksize.iv b/test/data/file/aes128/cfb/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes128/cfb/blocksize.iv
+++ b/test/data/file/aes128/cfb/blocksize.iv
diff --git a/test/file/aes128/cfb/blocksize.key b/test/data/file/aes128/cfb/blocksize.key
index d107b25..d107b25 100644
--- a/test/file/aes128/cfb/blocksize.key
+++ b/test/data/file/aes128/cfb/blocksize.key
diff --git a/test/file/aes128/cfb/blocksize.plain b/test/data/file/aes128/cfb/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes128/cfb/blocksize.plain
+++ b/test/data/file/aes128/cfb/blocksize.plain
diff --git a/test/file/aes128/cfb/empty1.cipher b/test/data/file/aes128/cfb/empty1.cipher
index e69de29..e69de29 100644
--- a/test/file/aes128/cfb/empty1.cipher
+++ b/test/data/file/aes128/cfb/empty1.cipher
diff --git a/test/file/aes128/cfb/empty1.iv b/test/data/file/aes128/cfb/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes128/cfb/empty1.iv
+++ b/test/data/file/aes128/cfb/empty1.iv
diff --git a/test/file/aes128/cfb/empty1.key b/test/data/file/aes128/cfb/empty1.key
index 445c724..445c724 100644
--- a/test/file/aes128/cfb/empty1.key
+++ b/test/data/file/aes128/cfb/empty1.key
diff --git a/test/file/aes128/cfb/empty1.plain b/test/data/file/aes128/cfb/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes128/cfb/empty1.plain
+++ b/test/data/file/aes128/cfb/empty1.plain
diff --git a/test/file/aes128/cfb/empty2.cipher b/test/data/file/aes128/cfb/empty2.cipher
index e69de29..e69de29 100644
--- a/test/file/aes128/cfb/empty2.cipher
+++ b/test/data/file/aes128/cfb/empty2.cipher
diff --git a/test/file/aes128/cfb/empty2.iv b/test/data/file/aes128/cfb/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes128/cfb/empty2.iv
+++ b/test/data/file/aes128/cfb/empty2.iv
diff --git a/test/file/aes128/cfb/empty2.key b/test/data/file/aes128/cfb/empty2.key
index 8bf836e..8bf836e 100644
--- a/test/file/aes128/cfb/empty2.key
+++ b/test/data/file/aes128/cfb/empty2.key
diff --git a/test/file/aes128/cfb/empty2.plain b/test/data/file/aes128/cfb/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes128/cfb/empty2.plain
+++ b/test/data/file/aes128/cfb/empty2.plain
diff --git a/test/file/aes128/cfb/random64k.cipher b/test/data/file/aes128/cfb/random64k.cipher
index 4cf71a3..4cf71a3 100644
--- a/test/file/aes128/cfb/random64k.cipher
+++ b/test/data/file/aes128/cfb/random64k.cipher
diff --git a/test/file/aes128/cfb/random64k.iv b/test/data/file/aes128/cfb/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes128/cfb/random64k.iv
+++ b/test/data/file/aes128/cfb/random64k.iv
diff --git a/test/file/aes128/cfb/random64k.key b/test/data/file/aes128/cfb/random64k.key
index dfb32f9..dfb32f9 100644
--- a/test/file/aes128/cfb/random64k.key
+++ b/test/data/file/aes128/cfb/random64k.key
diff --git a/test/file/aes128/cfb/random64k.plain b/test/data/file/aes128/cfb/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes128/cfb/random64k.plain
+++ b/test/data/file/aes128/cfb/random64k.plain
diff --git a/test/file/aes128/cfb/singlechar.cipher b/test/data/file/aes128/cfb/singlechar.cipher
index ea0c8a8..ea0c8a8 100644
--- a/test/file/aes128/cfb/singlechar.cipher
+++ b/test/data/file/aes128/cfb/singlechar.cipher
diff --git a/test/file/aes128/cfb/singlechar.iv b/test/data/file/aes128/cfb/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes128/cfb/singlechar.iv
+++ b/test/data/file/aes128/cfb/singlechar.iv
diff --git a/test/file/aes128/cfb/singlechar.key b/test/data/file/aes128/cfb/singlechar.key
index b1244a6..b1244a6 100644
--- a/test/file/aes128/cfb/singlechar.key
+++ b/test/data/file/aes128/cfb/singlechar.key
diff --git a/test/file/aes128/cfb/singlechar.plain b/test/data/file/aes128/cfb/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes128/cfb/singlechar.plain
+++ b/test/data/file/aes128/cfb/singlechar.plain
diff --git a/test/file/aes128/ctr/blocksize-1.cipher b/test/data/file/aes128/ctr/blocksize-1.cipher
index 1e482a8..1e482a8 100644
--- a/test/file/aes128/ctr/blocksize-1.cipher
+++ b/test/data/file/aes128/ctr/blocksize-1.cipher
diff --git a/test/file/aes128/ctr/blocksize-1.iv b/test/data/file/aes128/ctr/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes128/ctr/blocksize-1.iv
+++ b/test/data/file/aes128/ctr/blocksize-1.iv
diff --git a/test/file/aes128/ctr/blocksize-1.key b/test/data/file/aes128/ctr/blocksize-1.key
index 65aef92..65aef92 100644
--- a/test/file/aes128/ctr/blocksize-1.key
+++ b/test/data/file/aes128/ctr/blocksize-1.key
diff --git a/test/file/aes128/ctr/blocksize-1.plain b/test/data/file/aes128/ctr/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes128/ctr/blocksize-1.plain
+++ b/test/data/file/aes128/ctr/blocksize-1.plain
diff --git a/test/file/aes128/ctr/blocksize.cipher b/test/data/file/aes128/ctr/blocksize.cipher
index 4191a35..4191a35 100644
--- a/test/file/aes128/ctr/blocksize.cipher
+++ b/test/data/file/aes128/ctr/blocksize.cipher
diff --git a/test/file/aes128/ctr/blocksize.iv b/test/data/file/aes128/ctr/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes128/ctr/blocksize.iv
+++ b/test/data/file/aes128/ctr/blocksize.iv
diff --git a/test/file/aes128/ctr/blocksize.key b/test/data/file/aes128/ctr/blocksize.key
index d107b25..d107b25 100644
--- a/test/file/aes128/ctr/blocksize.key
+++ b/test/data/file/aes128/ctr/blocksize.key
diff --git a/test/file/aes128/ctr/blocksize.plain b/test/data/file/aes128/ctr/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes128/ctr/blocksize.plain
+++ b/test/data/file/aes128/ctr/blocksize.plain
diff --git a/test/file/aes128/ctr/empty1.cipher b/test/data/file/aes128/ctr/empty1.cipher
index e69de29..e69de29 100644
--- a/test/file/aes128/ctr/empty1.cipher
+++ b/test/data/file/aes128/ctr/empty1.cipher
diff --git a/test/file/aes128/ctr/empty1.iv b/test/data/file/aes128/ctr/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes128/ctr/empty1.iv
+++ b/test/data/file/aes128/ctr/empty1.iv
diff --git a/test/file/aes128/ctr/empty1.key b/test/data/file/aes128/ctr/empty1.key
index 445c724..445c724 100644
--- a/test/file/aes128/ctr/empty1.key
+++ b/test/data/file/aes128/ctr/empty1.key
diff --git a/test/file/aes128/ctr/empty1.plain b/test/data/file/aes128/ctr/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes128/ctr/empty1.plain
+++ b/test/data/file/aes128/ctr/empty1.plain
diff --git a/test/file/aes128/ctr/empty2.cipher b/test/data/file/aes128/ctr/empty2.cipher
index e69de29..e69de29 100644
--- a/test/file/aes128/ctr/empty2.cipher
+++ b/test/data/file/aes128/ctr/empty2.cipher
diff --git a/test/file/aes128/ctr/empty2.iv b/test/data/file/aes128/ctr/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes128/ctr/empty2.iv
+++ b/test/data/file/aes128/ctr/empty2.iv
diff --git a/test/file/aes128/ctr/empty2.key b/test/data/file/aes128/ctr/empty2.key
index 8bf836e..8bf836e 100644
--- a/test/file/aes128/ctr/empty2.key
+++ b/test/data/file/aes128/ctr/empty2.key
diff --git a/test/file/aes128/ctr/empty2.plain b/test/data/file/aes128/ctr/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes128/ctr/empty2.plain
+++ b/test/data/file/aes128/ctr/empty2.plain
diff --git a/test/file/aes128/ctr/random64k.cipher b/test/data/file/aes128/ctr/random64k.cipher
index 081917b..081917b 100644
--- a/test/file/aes128/ctr/random64k.cipher
+++ b/test/data/file/aes128/ctr/random64k.cipher
diff --git a/test/file/aes128/ctr/random64k.iv b/test/data/file/aes128/ctr/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes128/ctr/random64k.iv
+++ b/test/data/file/aes128/ctr/random64k.iv
diff --git a/test/file/aes128/ctr/random64k.key b/test/data/file/aes128/ctr/random64k.key
index dfb32f9..dfb32f9 100644
--- a/test/file/aes128/ctr/random64k.key
+++ b/test/data/file/aes128/ctr/random64k.key
diff --git a/test/file/aes128/ctr/random64k.plain b/test/data/file/aes128/ctr/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes128/ctr/random64k.plain
+++ b/test/data/file/aes128/ctr/random64k.plain
diff --git a/test/file/aes128/ctr/singlechar.cipher b/test/data/file/aes128/ctr/singlechar.cipher
index ea0c8a8..ea0c8a8 100644
--- a/test/file/aes128/ctr/singlechar.cipher
+++ b/test/data/file/aes128/ctr/singlechar.cipher
diff --git a/test/file/aes128/ctr/singlechar.iv b/test/data/file/aes128/ctr/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes128/ctr/singlechar.iv
+++ b/test/data/file/aes128/ctr/singlechar.iv
diff --git a/test/file/aes128/ctr/singlechar.key b/test/data/file/aes128/ctr/singlechar.key
index b1244a6..b1244a6 100644
--- a/test/file/aes128/ctr/singlechar.key
+++ b/test/data/file/aes128/ctr/singlechar.key
diff --git a/test/file/aes128/ctr/singlechar.plain b/test/data/file/aes128/ctr/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes128/ctr/singlechar.plain
+++ b/test/data/file/aes128/ctr/singlechar.plain
diff --git a/test/file/aes128/ecb/blocksize-1.cipher b/test/data/file/aes128/ecb/blocksize-1.cipher
index 7733924..7733924 100644
--- a/test/file/aes128/ecb/blocksize-1.cipher
+++ b/test/data/file/aes128/ecb/blocksize-1.cipher
diff --git a/test/file/aes128/ecb/blocksize-1.key b/test/data/file/aes128/ecb/blocksize-1.key
index 8bf836e..8bf836e 100644
--- a/test/file/aes128/ecb/blocksize-1.key
+++ b/test/data/file/aes128/ecb/blocksize-1.key
diff --git a/test/file/aes128/ecb/blocksize-1.plain b/test/data/file/aes128/ecb/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes128/ecb/blocksize-1.plain
+++ b/test/data/file/aes128/ecb/blocksize-1.plain
diff --git a/test/file/aes128/ecb/blocksize.cipher b/test/data/file/aes128/ecb/blocksize.cipher
index d8e4d34..d8e4d34 100644
--- a/test/file/aes128/ecb/blocksize.cipher
+++ b/test/data/file/aes128/ecb/blocksize.cipher
diff --git a/test/file/aes128/ecb/blocksize.key b/test/data/file/aes128/ecb/blocksize.key
index d107b25..d107b25 100644
--- a/test/file/aes128/ecb/blocksize.key
+++ b/test/data/file/aes128/ecb/blocksize.key
diff --git a/test/file/aes128/ecb/blocksize.plain b/test/data/file/aes128/ecb/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes128/ecb/blocksize.plain
+++ b/test/data/file/aes128/ecb/blocksize.plain
diff --git a/test/file/aes128/ecb/empty1.cipher b/test/data/file/aes128/ecb/empty1.cipher
index b2e558d..b2e558d 100644
--- a/test/file/aes128/ecb/empty1.cipher
+++ b/test/data/file/aes128/ecb/empty1.cipher
diff --git a/test/file/aes128/ecb/empty1.key b/test/data/file/aes128/ecb/empty1.key
index 445c724..445c724 100644
--- a/test/file/aes128/ecb/empty1.key
+++ b/test/data/file/aes128/ecb/empty1.key
diff --git a/test/file/aes128/ecb/empty1.plain b/test/data/file/aes128/ecb/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes128/ecb/empty1.plain
+++ b/test/data/file/aes128/ecb/empty1.plain
diff --git a/test/file/aes128/ecb/empty2.cipher b/test/data/file/aes128/ecb/empty2.cipher
index 3bd4dc2..3bd4dc2 100644
--- a/test/file/aes128/ecb/empty2.cipher
+++ b/test/data/file/aes128/ecb/empty2.cipher
diff --git a/test/file/aes128/ecb/empty2.key b/test/data/file/aes128/ecb/empty2.key
index 8bf836e..8bf836e 100644
--- a/test/file/aes128/ecb/empty2.key
+++ b/test/data/file/aes128/ecb/empty2.key
diff --git a/test/file/aes128/ecb/empty2.plain b/test/data/file/aes128/ecb/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes128/ecb/empty2.plain
+++ b/test/data/file/aes128/ecb/empty2.plain
diff --git a/test/file/aes128/ecb/random64k.cipher b/test/data/file/aes128/ecb/random64k.cipher
index 5a97526..5a97526 100644
--- a/test/file/aes128/ecb/random64k.cipher
+++ b/test/data/file/aes128/ecb/random64k.cipher
diff --git a/test/file/aes128/ecb/random64k.key b/test/data/file/aes128/ecb/random64k.key
index dfb32f9..dfb32f9 100644
--- a/test/file/aes128/ecb/random64k.key
+++ b/test/data/file/aes128/ecb/random64k.key
diff --git a/test/file/aes128/ecb/random64k.plain b/test/data/file/aes128/ecb/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes128/ecb/random64k.plain
+++ b/test/data/file/aes128/ecb/random64k.plain
diff --git a/test/file/aes128/ecb/singlechar.cipher b/test/data/file/aes128/ecb/singlechar.cipher
index 1b2fcef..1b2fcef 100644
--- a/test/file/aes128/ecb/singlechar.cipher
+++ b/test/data/file/aes128/ecb/singlechar.cipher
diff --git a/test/file/aes128/ecb/singlechar.key b/test/data/file/aes128/ecb/singlechar.key
index b1244a6..b1244a6 100644
--- a/test/file/aes128/ecb/singlechar.key
+++ b/test/data/file/aes128/ecb/singlechar.key
diff --git a/test/file/aes128/ecb/singlechar.plain b/test/data/file/aes128/ecb/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes128/ecb/singlechar.plain
+++ b/test/data/file/aes128/ecb/singlechar.plain
diff --git a/test/file/aes128/ofb/blocksize-1.cipher b/test/data/file/aes128/ofb/blocksize-1.cipher
index 1e482a8..1e482a8 100644
--- a/test/file/aes128/ofb/blocksize-1.cipher
+++ b/test/data/file/aes128/ofb/blocksize-1.cipher
diff --git a/test/file/aes128/ofb/blocksize-1.iv b/test/data/file/aes128/ofb/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes128/ofb/blocksize-1.iv
+++ b/test/data/file/aes128/ofb/blocksize-1.iv
diff --git a/test/file/aes128/ofb/blocksize-1.key b/test/data/file/aes128/ofb/blocksize-1.key
index 65aef92..65aef92 100644
--- a/test/file/aes128/ofb/blocksize-1.key
+++ b/test/data/file/aes128/ofb/blocksize-1.key
diff --git a/test/file/aes128/ofb/blocksize-1.plain b/test/data/file/aes128/ofb/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes128/ofb/blocksize-1.plain
+++ b/test/data/file/aes128/ofb/blocksize-1.plain
diff --git a/test/file/aes128/ofb/blocksize.cipher b/test/data/file/aes128/ofb/blocksize.cipher
index 4191a35..4191a35 100644
--- a/test/file/aes128/ofb/blocksize.cipher
+++ b/test/data/file/aes128/ofb/blocksize.cipher
diff --git a/test/file/aes128/ofb/blocksize.iv b/test/data/file/aes128/ofb/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes128/ofb/blocksize.iv
+++ b/test/data/file/aes128/ofb/blocksize.iv
diff --git a/test/file/aes128/ofb/blocksize.key b/test/data/file/aes128/ofb/blocksize.key
index d107b25..d107b25 100644
--- a/test/file/aes128/ofb/blocksize.key
+++ b/test/data/file/aes128/ofb/blocksize.key
diff --git a/test/file/aes128/ofb/blocksize.plain b/test/data/file/aes128/ofb/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes128/ofb/blocksize.plain
+++ b/test/data/file/aes128/ofb/blocksize.plain
diff --git a/test/file/aes128/ofb/empty1.cipher b/test/data/file/aes128/ofb/empty1.cipher
index e69de29..e69de29 100644
--- a/test/file/aes128/ofb/empty1.cipher
+++ b/test/data/file/aes128/ofb/empty1.cipher
diff --git a/test/file/aes128/ofb/empty1.iv b/test/data/file/aes128/ofb/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes128/ofb/empty1.iv
+++ b/test/data/file/aes128/ofb/empty1.iv
diff --git a/test/file/aes128/ofb/empty1.key b/test/data/file/aes128/ofb/empty1.key
index 445c724..445c724 100644
--- a/test/file/aes128/ofb/empty1.key
+++ b/test/data/file/aes128/ofb/empty1.key
diff --git a/test/file/aes128/ofb/empty1.plain b/test/data/file/aes128/ofb/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes128/ofb/empty1.plain
+++ b/test/data/file/aes128/ofb/empty1.plain
diff --git a/test/file/aes128/ofb/empty2.cipher b/test/data/file/aes128/ofb/empty2.cipher
index e69de29..e69de29 100644
--- a/test/file/aes128/ofb/empty2.cipher
+++ b/test/data/file/aes128/ofb/empty2.cipher
diff --git a/test/file/aes128/ofb/empty2.iv b/test/data/file/aes128/ofb/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes128/ofb/empty2.iv
+++ b/test/data/file/aes128/ofb/empty2.iv
diff --git a/test/file/aes128/ofb/empty2.key b/test/data/file/aes128/ofb/empty2.key
index 8bf836e..8bf836e 100644
--- a/test/file/aes128/ofb/empty2.key
+++ b/test/data/file/aes128/ofb/empty2.key
diff --git a/test/file/aes128/ofb/empty2.plain b/test/data/file/aes128/ofb/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes128/ofb/empty2.plain
+++ b/test/data/file/aes128/ofb/empty2.plain
diff --git a/test/file/aes128/ofb/random64k.cipher b/test/data/file/aes128/ofb/random64k.cipher
index 783cb90..783cb90 100644
--- a/test/file/aes128/ofb/random64k.cipher
+++ b/test/data/file/aes128/ofb/random64k.cipher
diff --git a/test/file/aes128/ofb/random64k.iv b/test/data/file/aes128/ofb/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes128/ofb/random64k.iv
+++ b/test/data/file/aes128/ofb/random64k.iv
diff --git a/test/file/aes128/ofb/random64k.key b/test/data/file/aes128/ofb/random64k.key
index dfb32f9..dfb32f9 100644
--- a/test/file/aes128/ofb/random64k.key
+++ b/test/data/file/aes128/ofb/random64k.key
diff --git a/test/file/aes128/ofb/random64k.plain b/test/data/file/aes128/ofb/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes128/ofb/random64k.plain
+++ b/test/data/file/aes128/ofb/random64k.plain
diff --git a/test/file/aes128/ofb/singlechar.cipher b/test/data/file/aes128/ofb/singlechar.cipher
index ea0c8a8..ea0c8a8 100644
--- a/test/file/aes128/ofb/singlechar.cipher
+++ b/test/data/file/aes128/ofb/singlechar.cipher
diff --git a/test/file/aes128/ofb/singlechar.iv b/test/data/file/aes128/ofb/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes128/ofb/singlechar.iv
+++ b/test/data/file/aes128/ofb/singlechar.iv
diff --git a/test/file/aes128/ofb/singlechar.key b/test/data/file/aes128/ofb/singlechar.key
index b1244a6..b1244a6 100644
--- a/test/file/aes128/ofb/singlechar.key
+++ b/test/data/file/aes128/ofb/singlechar.key
diff --git a/test/file/aes128/ofb/singlechar.plain b/test/data/file/aes128/ofb/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes128/ofb/singlechar.plain
+++ b/test/data/file/aes128/ofb/singlechar.plain
diff --git a/test/file/aes192/cbc/blocksize-1.cipher b/test/data/file/aes192/cbc/blocksize-1.cipher
index 49452d7..49452d7 100644
--- a/test/file/aes192/cbc/blocksize-1.cipher
+++ b/test/data/file/aes192/cbc/blocksize-1.cipher
diff --git a/test/file/aes192/cbc/blocksize-1.iv b/test/data/file/aes192/cbc/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes192/cbc/blocksize-1.iv
+++ b/test/data/file/aes192/cbc/blocksize-1.iv
diff --git a/test/file/aes192/cbc/blocksize-1.key b/test/data/file/aes192/cbc/blocksize-1.key
index de427c6..de427c6 100644
--- a/test/file/aes192/cbc/blocksize-1.key
+++ b/test/data/file/aes192/cbc/blocksize-1.key
diff --git a/test/file/aes192/cbc/blocksize-1.plain b/test/data/file/aes192/cbc/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes192/cbc/blocksize-1.plain
+++ b/test/data/file/aes192/cbc/blocksize-1.plain
diff --git a/test/file/aes192/cbc/blocksize.cipher b/test/data/file/aes192/cbc/blocksize.cipher
index 6fa9102..6fa9102 100644
--- a/test/file/aes192/cbc/blocksize.cipher
+++ b/test/data/file/aes192/cbc/blocksize.cipher
diff --git a/test/file/aes192/cbc/blocksize.iv b/test/data/file/aes192/cbc/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes192/cbc/blocksize.iv
+++ b/test/data/file/aes192/cbc/blocksize.iv
diff --git a/test/file/aes192/cbc/blocksize.key b/test/data/file/aes192/cbc/blocksize.key
index e9bb563..e9bb563 100644
--- a/test/file/aes192/cbc/blocksize.key
+++ b/test/data/file/aes192/cbc/blocksize.key
diff --git a/test/file/aes192/cbc/blocksize.plain b/test/data/file/aes192/cbc/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes192/cbc/blocksize.plain
+++ b/test/data/file/aes192/cbc/blocksize.plain
diff --git a/test/file/aes192/cbc/empty1.cipher b/test/data/file/aes192/cbc/empty1.cipher
index bb790e8..bb790e8 100644
--- a/test/file/aes192/cbc/empty1.cipher
+++ b/test/data/file/aes192/cbc/empty1.cipher
diff --git a/test/file/aes192/cbc/empty1.iv b/test/data/file/aes192/cbc/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes192/cbc/empty1.iv
+++ b/test/data/file/aes192/cbc/empty1.iv
diff --git a/test/file/aes192/cbc/empty1.key b/test/data/file/aes192/cbc/empty1.key
index b644ad8..b644ad8 100644
--- a/test/file/aes192/cbc/empty1.key
+++ b/test/data/file/aes192/cbc/empty1.key
diff --git a/test/file/aes192/cbc/empty1.plain b/test/data/file/aes192/cbc/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes192/cbc/empty1.plain
+++ b/test/data/file/aes192/cbc/empty1.plain
diff --git a/test/file/aes192/cbc/empty2.cipher b/test/data/file/aes192/cbc/empty2.cipher
index 55ff19f..55ff19f 100644
--- a/test/file/aes192/cbc/empty2.cipher
+++ b/test/data/file/aes192/cbc/empty2.cipher
diff --git a/test/file/aes192/cbc/empty2.iv b/test/data/file/aes192/cbc/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes192/cbc/empty2.iv
+++ b/test/data/file/aes192/cbc/empty2.iv
diff --git a/test/file/aes192/cbc/empty2.key b/test/data/file/aes192/cbc/empty2.key
index de427c6..de427c6 100644
--- a/test/file/aes192/cbc/empty2.key
+++ b/test/data/file/aes192/cbc/empty2.key
diff --git a/test/file/aes192/cbc/empty2.plain b/test/data/file/aes192/cbc/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes192/cbc/empty2.plain
+++ b/test/data/file/aes192/cbc/empty2.plain
diff --git a/test/file/aes192/cbc/random64k.cipher b/test/data/file/aes192/cbc/random64k.cipher
index 3fc6fb3..3fc6fb3 100644
--- a/test/file/aes192/cbc/random64k.cipher
+++ b/test/data/file/aes192/cbc/random64k.cipher
diff --git a/test/file/aes192/cbc/random64k.iv b/test/data/file/aes192/cbc/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes192/cbc/random64k.iv
+++ b/test/data/file/aes192/cbc/random64k.iv
diff --git a/test/file/aes192/cbc/random64k.key b/test/data/file/aes192/cbc/random64k.key
index f0a9e25..f0a9e25 100644
--- a/test/file/aes192/cbc/random64k.key
+++ b/test/data/file/aes192/cbc/random64k.key
diff --git a/test/file/aes192/cbc/random64k.plain b/test/data/file/aes192/cbc/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes192/cbc/random64k.plain
+++ b/test/data/file/aes192/cbc/random64k.plain
diff --git a/test/file/aes192/cbc/singlechar.cipher b/test/data/file/aes192/cbc/singlechar.cipher
index 4eae5ac..4eae5ac 100644
--- a/test/file/aes192/cbc/singlechar.cipher
+++ b/test/data/file/aes192/cbc/singlechar.cipher
diff --git a/test/file/aes192/cbc/singlechar.iv b/test/data/file/aes192/cbc/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes192/cbc/singlechar.iv
+++ b/test/data/file/aes192/cbc/singlechar.iv
diff --git a/test/file/aes192/cbc/singlechar.key b/test/data/file/aes192/cbc/singlechar.key
index f2208cf..f2208cf 100644
--- a/test/file/aes192/cbc/singlechar.key
+++ b/test/data/file/aes192/cbc/singlechar.key
diff --git a/test/file/aes192/cbc/singlechar.plain b/test/data/file/aes192/cbc/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes192/cbc/singlechar.plain
+++ b/test/data/file/aes192/cbc/singlechar.plain
diff --git a/test/file/aes192/cfb/blocksize-1.cipher b/test/data/file/aes192/cfb/blocksize-1.cipher
index ed2b8eb..ed2b8eb 100644
--- a/test/file/aes192/cfb/blocksize-1.cipher
+++ b/test/data/file/aes192/cfb/blocksize-1.cipher
diff --git a/test/file/aes192/cfb/blocksize-1.iv b/test/data/file/aes192/cfb/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes192/cfb/blocksize-1.iv
+++ b/test/data/file/aes192/cfb/blocksize-1.iv
diff --git a/test/file/aes192/cfb/blocksize-1.key b/test/data/file/aes192/cfb/blocksize-1.key
index de427c6..de427c6 100644
--- a/test/file/aes192/cfb/blocksize-1.key
+++ b/test/data/file/aes192/cfb/blocksize-1.key
diff --git a/test/file/aes192/cfb/blocksize-1.plain b/test/data/file/aes192/cfb/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes192/cfb/blocksize-1.plain
+++ b/test/data/file/aes192/cfb/blocksize-1.plain
diff --git a/test/file/aes192/cfb/blocksize.cipher b/test/data/file/aes192/cfb/blocksize.cipher
index 210c21d..210c21d 100644
--- a/test/file/aes192/cfb/blocksize.cipher
+++ b/test/data/file/aes192/cfb/blocksize.cipher
diff --git a/test/file/aes192/cfb/blocksize.iv b/test/data/file/aes192/cfb/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes192/cfb/blocksize.iv
+++ b/test/data/file/aes192/cfb/blocksize.iv
diff --git a/test/file/aes192/cfb/blocksize.key b/test/data/file/aes192/cfb/blocksize.key
index e9bb563..e9bb563 100644
--- a/test/file/aes192/cfb/blocksize.key
+++ b/test/data/file/aes192/cfb/blocksize.key
diff --git a/test/file/aes192/cfb/blocksize.plain b/test/data/file/aes192/cfb/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes192/cfb/blocksize.plain
+++ b/test/data/file/aes192/cfb/blocksize.plain
diff --git a/test/file/aes192/cfb/empty1.cipher b/test/data/file/aes192/cfb/empty1.cipher
index e69de29..e69de29 100644
--- a/test/file/aes192/cfb/empty1.cipher
+++ b/test/data/file/aes192/cfb/empty1.cipher
diff --git a/test/file/aes192/cfb/empty1.iv b/test/data/file/aes192/cfb/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes192/cfb/empty1.iv
+++ b/test/data/file/aes192/cfb/empty1.iv
diff --git a/test/file/aes192/cfb/empty1.key b/test/data/file/aes192/cfb/empty1.key
index b644ad8..b644ad8 100644
--- a/test/file/aes192/cfb/empty1.key
+++ b/test/data/file/aes192/cfb/empty1.key
diff --git a/test/file/aes192/cfb/empty1.plain b/test/data/file/aes192/cfb/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes192/cfb/empty1.plain
+++ b/test/data/file/aes192/cfb/empty1.plain
diff --git a/test/file/aes192/cfb/empty2.cipher b/test/data/file/aes192/cfb/empty2.cipher
index e69de29..e69de29 100644
--- a/test/file/aes192/cfb/empty2.cipher
+++ b/test/data/file/aes192/cfb/empty2.cipher
diff --git a/test/file/aes192/cfb/empty2.iv b/test/data/file/aes192/cfb/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes192/cfb/empty2.iv
+++ b/test/data/file/aes192/cfb/empty2.iv
diff --git a/test/file/aes192/cfb/empty2.key b/test/data/file/aes192/cfb/empty2.key
index de427c6..de427c6 100644
--- a/test/file/aes192/cfb/empty2.key
+++ b/test/data/file/aes192/cfb/empty2.key
diff --git a/test/file/aes192/cfb/empty2.plain b/test/data/file/aes192/cfb/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes192/cfb/empty2.plain
+++ b/test/data/file/aes192/cfb/empty2.plain
diff --git a/test/file/aes192/cfb/random64k.cipher b/test/data/file/aes192/cfb/random64k.cipher
index f127629..f127629 100644
--- a/test/file/aes192/cfb/random64k.cipher
+++ b/test/data/file/aes192/cfb/random64k.cipher
diff --git a/test/file/aes192/cfb/random64k.iv b/test/data/file/aes192/cfb/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes192/cfb/random64k.iv
+++ b/test/data/file/aes192/cfb/random64k.iv
diff --git a/test/file/aes192/cfb/random64k.key b/test/data/file/aes192/cfb/random64k.key
index f0a9e25..f0a9e25 100644
--- a/test/file/aes192/cfb/random64k.key
+++ b/test/data/file/aes192/cfb/random64k.key
diff --git a/test/file/aes192/cfb/random64k.plain b/test/data/file/aes192/cfb/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes192/cfb/random64k.plain
+++ b/test/data/file/aes192/cfb/random64k.plain
diff --git a/test/file/aes192/cfb/singlechar.cipher b/test/data/file/aes192/cfb/singlechar.cipher
index e25f181..e25f181 100644
--- a/test/file/aes192/cfb/singlechar.cipher
+++ b/test/data/file/aes192/cfb/singlechar.cipher
diff --git a/test/file/aes192/cfb/singlechar.iv b/test/data/file/aes192/cfb/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes192/cfb/singlechar.iv
+++ b/test/data/file/aes192/cfb/singlechar.iv
diff --git a/test/file/aes192/cfb/singlechar.key b/test/data/file/aes192/cfb/singlechar.key
index f2208cf..f2208cf 100644
--- a/test/file/aes192/cfb/singlechar.key
+++ b/test/data/file/aes192/cfb/singlechar.key
diff --git a/test/file/aes192/cfb/singlechar.plain b/test/data/file/aes192/cfb/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes192/cfb/singlechar.plain
+++ b/test/data/file/aes192/cfb/singlechar.plain
diff --git a/test/file/aes192/ctr/blocksize-1.cipher b/test/data/file/aes192/ctr/blocksize-1.cipher
index ed2b8eb..ed2b8eb 100644
--- a/test/file/aes192/ctr/blocksize-1.cipher
+++ b/test/data/file/aes192/ctr/blocksize-1.cipher
diff --git a/test/file/aes192/ctr/blocksize-1.iv b/test/data/file/aes192/ctr/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes192/ctr/blocksize-1.iv
+++ b/test/data/file/aes192/ctr/blocksize-1.iv
diff --git a/test/file/aes192/ctr/blocksize-1.key b/test/data/file/aes192/ctr/blocksize-1.key
index de427c6..de427c6 100644
--- a/test/file/aes192/ctr/blocksize-1.key
+++ b/test/data/file/aes192/ctr/blocksize-1.key
diff --git a/test/file/aes192/ctr/blocksize-1.plain b/test/data/file/aes192/ctr/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes192/ctr/blocksize-1.plain
+++ b/test/data/file/aes192/ctr/blocksize-1.plain
diff --git a/test/file/aes192/ctr/blocksize.cipher b/test/data/file/aes192/ctr/blocksize.cipher
index 210c21d..210c21d 100644
--- a/test/file/aes192/ctr/blocksize.cipher
+++ b/test/data/file/aes192/ctr/blocksize.cipher
diff --git a/test/file/aes192/ctr/blocksize.iv b/test/data/file/aes192/ctr/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes192/ctr/blocksize.iv
+++ b/test/data/file/aes192/ctr/blocksize.iv
diff --git a/test/file/aes192/ctr/blocksize.key b/test/data/file/aes192/ctr/blocksize.key
index e9bb563..e9bb563 100644
--- a/test/file/aes192/ctr/blocksize.key
+++ b/test/data/file/aes192/ctr/blocksize.key
diff --git a/test/file/aes192/ctr/blocksize.plain b/test/data/file/aes192/ctr/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes192/ctr/blocksize.plain
+++ b/test/data/file/aes192/ctr/blocksize.plain
diff --git a/test/file/aes192/ctr/empty1.cipher b/test/data/file/aes192/ctr/empty1.cipher
index e69de29..e69de29 100644
--- a/test/file/aes192/ctr/empty1.cipher
+++ b/test/data/file/aes192/ctr/empty1.cipher
diff --git a/test/file/aes192/ctr/empty1.iv b/test/data/file/aes192/ctr/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes192/ctr/empty1.iv
+++ b/test/data/file/aes192/ctr/empty1.iv
diff --git a/test/file/aes192/ctr/empty1.key b/test/data/file/aes192/ctr/empty1.key
index b644ad8..b644ad8 100644
--- a/test/file/aes192/ctr/empty1.key
+++ b/test/data/file/aes192/ctr/empty1.key
diff --git a/test/file/aes192/ctr/empty1.plain b/test/data/file/aes192/ctr/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes192/ctr/empty1.plain
+++ b/test/data/file/aes192/ctr/empty1.plain
diff --git a/test/file/aes192/ctr/empty2.cipher b/test/data/file/aes192/ctr/empty2.cipher
index e69de29..e69de29 100644
--- a/test/file/aes192/ctr/empty2.cipher
+++ b/test/data/file/aes192/ctr/empty2.cipher
diff --git a/test/file/aes192/ctr/empty2.iv b/test/data/file/aes192/ctr/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes192/ctr/empty2.iv
+++ b/test/data/file/aes192/ctr/empty2.iv
diff --git a/test/file/aes192/ctr/empty2.key b/test/data/file/aes192/ctr/empty2.key
index de427c6..de427c6 100644
--- a/test/file/aes192/ctr/empty2.key
+++ b/test/data/file/aes192/ctr/empty2.key
diff --git a/test/file/aes192/ctr/empty2.plain b/test/data/file/aes192/ctr/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes192/ctr/empty2.plain
+++ b/test/data/file/aes192/ctr/empty2.plain
diff --git a/test/file/aes192/ctr/random64k.cipher b/test/data/file/aes192/ctr/random64k.cipher
index 8535e1f..8535e1f 100644
--- a/test/file/aes192/ctr/random64k.cipher
+++ b/test/data/file/aes192/ctr/random64k.cipher
diff --git a/test/file/aes192/ctr/random64k.iv b/test/data/file/aes192/ctr/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes192/ctr/random64k.iv
+++ b/test/data/file/aes192/ctr/random64k.iv
diff --git a/test/file/aes192/ctr/random64k.key b/test/data/file/aes192/ctr/random64k.key
index f0a9e25..f0a9e25 100644
--- a/test/file/aes192/ctr/random64k.key
+++ b/test/data/file/aes192/ctr/random64k.key
diff --git a/test/file/aes192/ctr/random64k.plain b/test/data/file/aes192/ctr/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes192/ctr/random64k.plain
+++ b/test/data/file/aes192/ctr/random64k.plain
diff --git a/test/file/aes192/ctr/singlechar.cipher b/test/data/file/aes192/ctr/singlechar.cipher
index e25f181..e25f181 100644
--- a/test/file/aes192/ctr/singlechar.cipher
+++ b/test/data/file/aes192/ctr/singlechar.cipher
diff --git a/test/file/aes192/ctr/singlechar.iv b/test/data/file/aes192/ctr/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes192/ctr/singlechar.iv
+++ b/test/data/file/aes192/ctr/singlechar.iv
diff --git a/test/file/aes192/ctr/singlechar.key b/test/data/file/aes192/ctr/singlechar.key
index f2208cf..f2208cf 100644
--- a/test/file/aes192/ctr/singlechar.key
+++ b/test/data/file/aes192/ctr/singlechar.key
diff --git a/test/file/aes192/ctr/singlechar.plain b/test/data/file/aes192/ctr/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes192/ctr/singlechar.plain
+++ b/test/data/file/aes192/ctr/singlechar.plain
diff --git a/test/file/aes192/ecb/blocksize-1.cipher b/test/data/file/aes192/ecb/blocksize-1.cipher
index 8d67ac4..8d67ac4 100644
--- a/test/file/aes192/ecb/blocksize-1.cipher
+++ b/test/data/file/aes192/ecb/blocksize-1.cipher
diff --git a/test/file/aes192/ecb/blocksize-1.key b/test/data/file/aes192/ecb/blocksize-1.key
index de427c6..de427c6 100644
--- a/test/file/aes192/ecb/blocksize-1.key
+++ b/test/data/file/aes192/ecb/blocksize-1.key
diff --git a/test/file/aes192/ecb/blocksize-1.plain b/test/data/file/aes192/ecb/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes192/ecb/blocksize-1.plain
+++ b/test/data/file/aes192/ecb/blocksize-1.plain
diff --git a/test/file/aes192/ecb/blocksize.cipher b/test/data/file/aes192/ecb/blocksize.cipher
index 99c216f..99c216f 100644
--- a/test/file/aes192/ecb/blocksize.cipher
+++ b/test/data/file/aes192/ecb/blocksize.cipher
diff --git a/test/file/aes192/ecb/blocksize.key b/test/data/file/aes192/ecb/blocksize.key
index e9bb563..e9bb563 100644
--- a/test/file/aes192/ecb/blocksize.key
+++ b/test/data/file/aes192/ecb/blocksize.key
diff --git a/test/file/aes192/ecb/blocksize.plain b/test/data/file/aes192/ecb/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes192/ecb/blocksize.plain
+++ b/test/data/file/aes192/ecb/blocksize.plain
diff --git a/test/file/aes192/ecb/empty1.cipher b/test/data/file/aes192/ecb/empty1.cipher
index bb790e8..bb790e8 100644
--- a/test/file/aes192/ecb/empty1.cipher
+++ b/test/data/file/aes192/ecb/empty1.cipher
diff --git a/test/file/aes192/ecb/empty1.key b/test/data/file/aes192/ecb/empty1.key
index b644ad8..b644ad8 100644
--- a/test/file/aes192/ecb/empty1.key
+++ b/test/data/file/aes192/ecb/empty1.key
diff --git a/test/file/aes192/ecb/empty1.plain b/test/data/file/aes192/ecb/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes192/ecb/empty1.plain
+++ b/test/data/file/aes192/ecb/empty1.plain
diff --git a/test/file/aes192/ecb/empty2.cipher b/test/data/file/aes192/ecb/empty2.cipher
index a64f410..a64f410 100644
--- a/test/file/aes192/ecb/empty2.cipher
+++ b/test/data/file/aes192/ecb/empty2.cipher
diff --git a/test/file/aes192/ecb/empty2.key b/test/data/file/aes192/ecb/empty2.key
index de427c6..de427c6 100644
--- a/test/file/aes192/ecb/empty2.key
+++ b/test/data/file/aes192/ecb/empty2.key
diff --git a/test/file/aes192/ecb/empty2.plain b/test/data/file/aes192/ecb/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes192/ecb/empty2.plain
+++ b/test/data/file/aes192/ecb/empty2.plain
diff --git a/test/file/aes192/ecb/random64k.cipher b/test/data/file/aes192/ecb/random64k.cipher
index a11283e..a11283e 100644
--- a/test/file/aes192/ecb/random64k.cipher
+++ b/test/data/file/aes192/ecb/random64k.cipher
diff --git a/test/file/aes192/ecb/random64k.key b/test/data/file/aes192/ecb/random64k.key
index f0a9e25..f0a9e25 100644
--- a/test/file/aes192/ecb/random64k.key
+++ b/test/data/file/aes192/ecb/random64k.key
diff --git a/test/file/aes192/ecb/random64k.plain b/test/data/file/aes192/ecb/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes192/ecb/random64k.plain
+++ b/test/data/file/aes192/ecb/random64k.plain
diff --git a/test/file/aes192/ecb/singlechar.cipher b/test/data/file/aes192/ecb/singlechar.cipher
index 5414846..5414846 100644
--- a/test/file/aes192/ecb/singlechar.cipher
+++ b/test/data/file/aes192/ecb/singlechar.cipher
diff --git a/test/file/aes192/ecb/singlechar.key b/test/data/file/aes192/ecb/singlechar.key
index f2208cf..f2208cf 100644
--- a/test/file/aes192/ecb/singlechar.key
+++ b/test/data/file/aes192/ecb/singlechar.key
diff --git a/test/file/aes192/ecb/singlechar.plain b/test/data/file/aes192/ecb/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes192/ecb/singlechar.plain
+++ b/test/data/file/aes192/ecb/singlechar.plain
diff --git a/test/file/aes192/ofb/blocksize-1.cipher b/test/data/file/aes192/ofb/blocksize-1.cipher
index ed2b8eb..ed2b8eb 100644
--- a/test/file/aes192/ofb/blocksize-1.cipher
+++ b/test/data/file/aes192/ofb/blocksize-1.cipher
diff --git a/test/file/aes192/ofb/blocksize-1.iv b/test/data/file/aes192/ofb/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes192/ofb/blocksize-1.iv
+++ b/test/data/file/aes192/ofb/blocksize-1.iv
diff --git a/test/file/aes192/ofb/blocksize-1.key b/test/data/file/aes192/ofb/blocksize-1.key
index de427c6..de427c6 100644
--- a/test/file/aes192/ofb/blocksize-1.key
+++ b/test/data/file/aes192/ofb/blocksize-1.key
diff --git a/test/file/aes192/ofb/blocksize-1.plain b/test/data/file/aes192/ofb/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes192/ofb/blocksize-1.plain
+++ b/test/data/file/aes192/ofb/blocksize-1.plain
diff --git a/test/file/aes192/ofb/blocksize.cipher b/test/data/file/aes192/ofb/blocksize.cipher
index 210c21d..210c21d 100644
--- a/test/file/aes192/ofb/blocksize.cipher
+++ b/test/data/file/aes192/ofb/blocksize.cipher
diff --git a/test/file/aes192/ofb/blocksize.iv b/test/data/file/aes192/ofb/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes192/ofb/blocksize.iv
+++ b/test/data/file/aes192/ofb/blocksize.iv
diff --git a/test/file/aes192/ofb/blocksize.key b/test/data/file/aes192/ofb/blocksize.key
index e9bb563..e9bb563 100644
--- a/test/file/aes192/ofb/blocksize.key
+++ b/test/data/file/aes192/ofb/blocksize.key
diff --git a/test/file/aes192/ofb/blocksize.plain b/test/data/file/aes192/ofb/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes192/ofb/blocksize.plain
+++ b/test/data/file/aes192/ofb/blocksize.plain
diff --git a/test/file/aes192/ofb/empty1.cipher b/test/data/file/aes192/ofb/empty1.cipher
index e69de29..e69de29 100644
--- a/test/file/aes192/ofb/empty1.cipher
+++ b/test/data/file/aes192/ofb/empty1.cipher
diff --git a/test/file/aes192/ofb/empty1.iv b/test/data/file/aes192/ofb/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes192/ofb/empty1.iv
+++ b/test/data/file/aes192/ofb/empty1.iv
diff --git a/test/file/aes192/ofb/empty1.key b/test/data/file/aes192/ofb/empty1.key
index b644ad8..b644ad8 100644
--- a/test/file/aes192/ofb/empty1.key
+++ b/test/data/file/aes192/ofb/empty1.key
diff --git a/test/file/aes192/ofb/empty1.plain b/test/data/file/aes192/ofb/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes192/ofb/empty1.plain
+++ b/test/data/file/aes192/ofb/empty1.plain
diff --git a/test/file/aes192/ofb/empty2.cipher b/test/data/file/aes192/ofb/empty2.cipher
index e69de29..e69de29 100644
--- a/test/file/aes192/ofb/empty2.cipher
+++ b/test/data/file/aes192/ofb/empty2.cipher
diff --git a/test/file/aes192/ofb/empty2.iv b/test/data/file/aes192/ofb/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes192/ofb/empty2.iv
+++ b/test/data/file/aes192/ofb/empty2.iv
diff --git a/test/file/aes192/ofb/empty2.key b/test/data/file/aes192/ofb/empty2.key
index de427c6..de427c6 100644
--- a/test/file/aes192/ofb/empty2.key
+++ b/test/data/file/aes192/ofb/empty2.key
diff --git a/test/file/aes192/ofb/empty2.plain b/test/data/file/aes192/ofb/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes192/ofb/empty2.plain
+++ b/test/data/file/aes192/ofb/empty2.plain
diff --git a/test/file/aes192/ofb/random64k.cipher b/test/data/file/aes192/ofb/random64k.cipher
index 72c9628..72c9628 100644
--- a/test/file/aes192/ofb/random64k.cipher
+++ b/test/data/file/aes192/ofb/random64k.cipher
diff --git a/test/file/aes192/ofb/random64k.iv b/test/data/file/aes192/ofb/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes192/ofb/random64k.iv
+++ b/test/data/file/aes192/ofb/random64k.iv
diff --git a/test/file/aes192/ofb/random64k.key b/test/data/file/aes192/ofb/random64k.key
index f0a9e25..f0a9e25 100644
--- a/test/file/aes192/ofb/random64k.key
+++ b/test/data/file/aes192/ofb/random64k.key
diff --git a/test/file/aes192/ofb/random64k.plain b/test/data/file/aes192/ofb/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes192/ofb/random64k.plain
+++ b/test/data/file/aes192/ofb/random64k.plain
diff --git a/test/file/aes192/ofb/singlechar.cipher b/test/data/file/aes192/ofb/singlechar.cipher
index e25f181..e25f181 100644
--- a/test/file/aes192/ofb/singlechar.cipher
+++ b/test/data/file/aes192/ofb/singlechar.cipher
diff --git a/test/file/aes192/ofb/singlechar.iv b/test/data/file/aes192/ofb/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes192/ofb/singlechar.iv
+++ b/test/data/file/aes192/ofb/singlechar.iv
diff --git a/test/file/aes192/ofb/singlechar.key b/test/data/file/aes192/ofb/singlechar.key
index f2208cf..f2208cf 100644
--- a/test/file/aes192/ofb/singlechar.key
+++ b/test/data/file/aes192/ofb/singlechar.key
diff --git a/test/file/aes192/ofb/singlechar.plain b/test/data/file/aes192/ofb/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes192/ofb/singlechar.plain
+++ b/test/data/file/aes192/ofb/singlechar.plain
diff --git a/test/file/aes256/cbc/blocksize-1.cipher b/test/data/file/aes256/cbc/blocksize-1.cipher
index 7cb4030..7cb4030 100644
--- a/test/file/aes256/cbc/blocksize-1.cipher
+++ b/test/data/file/aes256/cbc/blocksize-1.cipher
diff --git a/test/file/aes256/cbc/blocksize-1.iv b/test/data/file/aes256/cbc/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes256/cbc/blocksize-1.iv
+++ b/test/data/file/aes256/cbc/blocksize-1.iv
diff --git a/test/file/aes256/cbc/blocksize-1.key b/test/data/file/aes256/cbc/blocksize-1.key
index fd3177c..fd3177c 100644
--- a/test/file/aes256/cbc/blocksize-1.key
+++ b/test/data/file/aes256/cbc/blocksize-1.key
diff --git a/test/file/aes256/cbc/blocksize-1.plain b/test/data/file/aes256/cbc/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes256/cbc/blocksize-1.plain
+++ b/test/data/file/aes256/cbc/blocksize-1.plain
diff --git a/test/file/aes256/cbc/blocksize.cipher b/test/data/file/aes256/cbc/blocksize.cipher
index d5fe6e0..d5fe6e0 100644
--- a/test/file/aes256/cbc/blocksize.cipher
+++ b/test/data/file/aes256/cbc/blocksize.cipher
diff --git a/test/file/aes256/cbc/blocksize.iv b/test/data/file/aes256/cbc/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes256/cbc/blocksize.iv
+++ b/test/data/file/aes256/cbc/blocksize.iv
diff --git a/test/file/aes256/cbc/blocksize.key b/test/data/file/aes256/cbc/blocksize.key
index 0e7479b..0e7479b 100644
--- a/test/file/aes256/cbc/blocksize.key
+++ b/test/data/file/aes256/cbc/blocksize.key
diff --git a/test/file/aes256/cbc/blocksize.plain b/test/data/file/aes256/cbc/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes256/cbc/blocksize.plain
+++ b/test/data/file/aes256/cbc/blocksize.plain
diff --git a/test/file/aes256/cbc/empty1.cipher b/test/data/file/aes256/cbc/empty1.cipher
index fd6ec3b..fd6ec3b 100644
--- a/test/file/aes256/cbc/empty1.cipher
+++ b/test/data/file/aes256/cbc/empty1.cipher
diff --git a/test/file/aes256/cbc/empty1.iv b/test/data/file/aes256/cbc/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes256/cbc/empty1.iv
+++ b/test/data/file/aes256/cbc/empty1.iv
diff --git a/test/file/aes256/cbc/empty1.key b/test/data/file/aes256/cbc/empty1.key
index 9c7bc66..9c7bc66 100644
--- a/test/file/aes256/cbc/empty1.key
+++ b/test/data/file/aes256/cbc/empty1.key
diff --git a/test/file/aes256/cbc/empty1.plain b/test/data/file/aes256/cbc/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes256/cbc/empty1.plain
+++ b/test/data/file/aes256/cbc/empty1.plain
diff --git a/test/file/aes256/cbc/empty2.cipher b/test/data/file/aes256/cbc/empty2.cipher
index 6e3f6f7..6e3f6f7 100644
--- a/test/file/aes256/cbc/empty2.cipher
+++ b/test/data/file/aes256/cbc/empty2.cipher
diff --git a/test/file/aes256/cbc/empty2.iv b/test/data/file/aes256/cbc/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes256/cbc/empty2.iv
+++ b/test/data/file/aes256/cbc/empty2.iv
diff --git a/test/file/aes256/cbc/empty2.key b/test/data/file/aes256/cbc/empty2.key
index fd3177c..fd3177c 100644
--- a/test/file/aes256/cbc/empty2.key
+++ b/test/data/file/aes256/cbc/empty2.key
diff --git a/test/file/aes256/cbc/empty2.plain b/test/data/file/aes256/cbc/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes256/cbc/empty2.plain
+++ b/test/data/file/aes256/cbc/empty2.plain
diff --git a/test/file/aes256/cbc/random64k.cipher b/test/data/file/aes256/cbc/random64k.cipher
index eb670be..eb670be 100644
--- a/test/file/aes256/cbc/random64k.cipher
+++ b/test/data/file/aes256/cbc/random64k.cipher
diff --git a/test/file/aes256/cbc/random64k.iv b/test/data/file/aes256/cbc/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes256/cbc/random64k.iv
+++ b/test/data/file/aes256/cbc/random64k.iv
diff --git a/test/file/aes256/cbc/random64k.key b/test/data/file/aes256/cbc/random64k.key
index c70339d..c70339d 100644
--- a/test/file/aes256/cbc/random64k.key
+++ b/test/data/file/aes256/cbc/random64k.key
diff --git a/test/file/aes256/cbc/random64k.plain b/test/data/file/aes256/cbc/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes256/cbc/random64k.plain
+++ b/test/data/file/aes256/cbc/random64k.plain
diff --git a/test/file/aes256/cbc/singlechar.cipher b/test/data/file/aes256/cbc/singlechar.cipher
index a11347b..a11347b 100644
--- a/test/file/aes256/cbc/singlechar.cipher
+++ b/test/data/file/aes256/cbc/singlechar.cipher
diff --git a/test/file/aes256/cbc/singlechar.iv b/test/data/file/aes256/cbc/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes256/cbc/singlechar.iv
+++ b/test/data/file/aes256/cbc/singlechar.iv
diff --git a/test/file/aes256/cbc/singlechar.key b/test/data/file/aes256/cbc/singlechar.key
index b9badf0..b9badf0 100644
--- a/test/file/aes256/cbc/singlechar.key
+++ b/test/data/file/aes256/cbc/singlechar.key
diff --git a/test/file/aes256/cbc/singlechar.plain b/test/data/file/aes256/cbc/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes256/cbc/singlechar.plain
+++ b/test/data/file/aes256/cbc/singlechar.plain
diff --git a/test/file/aes256/cfb/blocksize-1.cipher b/test/data/file/aes256/cfb/blocksize-1.cipher
index 946e96f..946e96f 100644
--- a/test/file/aes256/cfb/blocksize-1.cipher
+++ b/test/data/file/aes256/cfb/blocksize-1.cipher
diff --git a/test/file/aes256/cfb/blocksize-1.iv b/test/data/file/aes256/cfb/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes256/cfb/blocksize-1.iv
+++ b/test/data/file/aes256/cfb/blocksize-1.iv
diff --git a/test/file/aes256/cfb/blocksize-1.key b/test/data/file/aes256/cfb/blocksize-1.key
index fd3177c..fd3177c 100644
--- a/test/file/aes256/cfb/blocksize-1.key
+++ b/test/data/file/aes256/cfb/blocksize-1.key
diff --git a/test/file/aes256/cfb/blocksize-1.plain b/test/data/file/aes256/cfb/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes256/cfb/blocksize-1.plain
+++ b/test/data/file/aes256/cfb/blocksize-1.plain
diff --git a/test/file/aes256/cfb/blocksize.cipher b/test/data/file/aes256/cfb/blocksize.cipher
index c8a5846..c8a5846 100644
--- a/test/file/aes256/cfb/blocksize.cipher
+++ b/test/data/file/aes256/cfb/blocksize.cipher
diff --git a/test/file/aes256/cfb/blocksize.iv b/test/data/file/aes256/cfb/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes256/cfb/blocksize.iv
+++ b/test/data/file/aes256/cfb/blocksize.iv
diff --git a/test/file/aes256/cfb/blocksize.key b/test/data/file/aes256/cfb/blocksize.key
index 0e7479b..0e7479b 100644
--- a/test/file/aes256/cfb/blocksize.key
+++ b/test/data/file/aes256/cfb/blocksize.key
diff --git a/test/file/aes256/cfb/blocksize.plain b/test/data/file/aes256/cfb/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes256/cfb/blocksize.plain
+++ b/test/data/file/aes256/cfb/blocksize.plain
diff --git a/test/file/aes256/cfb/empty1.cipher b/test/data/file/aes256/cfb/empty1.cipher
index e69de29..e69de29 100644
--- a/test/file/aes256/cfb/empty1.cipher
+++ b/test/data/file/aes256/cfb/empty1.cipher
diff --git a/test/file/aes256/cfb/empty1.iv b/test/data/file/aes256/cfb/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes256/cfb/empty1.iv
+++ b/test/data/file/aes256/cfb/empty1.iv
diff --git a/test/file/aes256/cfb/empty1.key b/test/data/file/aes256/cfb/empty1.key
index 9c7bc66..9c7bc66 100644
--- a/test/file/aes256/cfb/empty1.key
+++ b/test/data/file/aes256/cfb/empty1.key
diff --git a/test/file/aes256/cfb/empty1.plain b/test/data/file/aes256/cfb/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes256/cfb/empty1.plain
+++ b/test/data/file/aes256/cfb/empty1.plain
diff --git a/test/file/aes256/cfb/empty2.cipher b/test/data/file/aes256/cfb/empty2.cipher
index e69de29..e69de29 100644
--- a/test/file/aes256/cfb/empty2.cipher
+++ b/test/data/file/aes256/cfb/empty2.cipher
diff --git a/test/file/aes256/cfb/empty2.iv b/test/data/file/aes256/cfb/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes256/cfb/empty2.iv
+++ b/test/data/file/aes256/cfb/empty2.iv
diff --git a/test/file/aes256/cfb/empty2.key b/test/data/file/aes256/cfb/empty2.key
index fd3177c..fd3177c 100644
--- a/test/file/aes256/cfb/empty2.key
+++ b/test/data/file/aes256/cfb/empty2.key
diff --git a/test/file/aes256/cfb/empty2.plain b/test/data/file/aes256/cfb/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes256/cfb/empty2.plain
+++ b/test/data/file/aes256/cfb/empty2.plain
diff --git a/test/file/aes256/cfb/random64k.cipher b/test/data/file/aes256/cfb/random64k.cipher
index 091f35c..091f35c 100644
--- a/test/file/aes256/cfb/random64k.cipher
+++ b/test/data/file/aes256/cfb/random64k.cipher
diff --git a/test/file/aes256/cfb/random64k.iv b/test/data/file/aes256/cfb/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes256/cfb/random64k.iv
+++ b/test/data/file/aes256/cfb/random64k.iv
diff --git a/test/file/aes256/cfb/random64k.key b/test/data/file/aes256/cfb/random64k.key
index c70339d..c70339d 100644
--- a/test/file/aes256/cfb/random64k.key
+++ b/test/data/file/aes256/cfb/random64k.key
diff --git a/test/file/aes256/cfb/random64k.plain b/test/data/file/aes256/cfb/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes256/cfb/random64k.plain
+++ b/test/data/file/aes256/cfb/random64k.plain
diff --git a/test/file/aes256/cfb/singlechar.cipher b/test/data/file/aes256/cfb/singlechar.cipher
index 883ad6e..883ad6e 100644
--- a/test/file/aes256/cfb/singlechar.cipher
+++ b/test/data/file/aes256/cfb/singlechar.cipher
diff --git a/test/file/aes256/cfb/singlechar.iv b/test/data/file/aes256/cfb/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes256/cfb/singlechar.iv
+++ b/test/data/file/aes256/cfb/singlechar.iv
diff --git a/test/file/aes256/cfb/singlechar.key b/test/data/file/aes256/cfb/singlechar.key
index b9badf0..b9badf0 100644
--- a/test/file/aes256/cfb/singlechar.key
+++ b/test/data/file/aes256/cfb/singlechar.key
diff --git a/test/file/aes256/cfb/singlechar.plain b/test/data/file/aes256/cfb/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes256/cfb/singlechar.plain
+++ b/test/data/file/aes256/cfb/singlechar.plain
diff --git a/test/file/aes256/ctr/blocksize-1.cipher b/test/data/file/aes256/ctr/blocksize-1.cipher
index 946e96f..946e96f 100644
--- a/test/file/aes256/ctr/blocksize-1.cipher
+++ b/test/data/file/aes256/ctr/blocksize-1.cipher
diff --git a/test/file/aes256/ctr/blocksize-1.iv b/test/data/file/aes256/ctr/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes256/ctr/blocksize-1.iv
+++ b/test/data/file/aes256/ctr/blocksize-1.iv
diff --git a/test/file/aes256/ctr/blocksize-1.key b/test/data/file/aes256/ctr/blocksize-1.key
index fd3177c..fd3177c 100644
--- a/test/file/aes256/ctr/blocksize-1.key
+++ b/test/data/file/aes256/ctr/blocksize-1.key
diff --git a/test/file/aes256/ctr/blocksize-1.plain b/test/data/file/aes256/ctr/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes256/ctr/blocksize-1.plain
+++ b/test/data/file/aes256/ctr/blocksize-1.plain
diff --git a/test/file/aes256/ctr/blocksize.cipher b/test/data/file/aes256/ctr/blocksize.cipher
index c8a5846..c8a5846 100644
--- a/test/file/aes256/ctr/blocksize.cipher
+++ b/test/data/file/aes256/ctr/blocksize.cipher
diff --git a/test/file/aes256/ctr/blocksize.iv b/test/data/file/aes256/ctr/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes256/ctr/blocksize.iv
+++ b/test/data/file/aes256/ctr/blocksize.iv
diff --git a/test/file/aes256/ctr/blocksize.key b/test/data/file/aes256/ctr/blocksize.key
index 0e7479b..0e7479b 100644
--- a/test/file/aes256/ctr/blocksize.key
+++ b/test/data/file/aes256/ctr/blocksize.key
diff --git a/test/file/aes256/ctr/blocksize.plain b/test/data/file/aes256/ctr/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes256/ctr/blocksize.plain
+++ b/test/data/file/aes256/ctr/blocksize.plain
diff --git a/test/file/aes256/ctr/empty1.cipher b/test/data/file/aes256/ctr/empty1.cipher
index e69de29..e69de29 100644
--- a/test/file/aes256/ctr/empty1.cipher
+++ b/test/data/file/aes256/ctr/empty1.cipher
diff --git a/test/file/aes256/ctr/empty1.iv b/test/data/file/aes256/ctr/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes256/ctr/empty1.iv
+++ b/test/data/file/aes256/ctr/empty1.iv
diff --git a/test/file/aes256/ctr/empty1.key b/test/data/file/aes256/ctr/empty1.key
index 9c7bc66..9c7bc66 100644
--- a/test/file/aes256/ctr/empty1.key
+++ b/test/data/file/aes256/ctr/empty1.key
diff --git a/test/file/aes256/ctr/empty1.plain b/test/data/file/aes256/ctr/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes256/ctr/empty1.plain
+++ b/test/data/file/aes256/ctr/empty1.plain
diff --git a/test/file/aes256/ctr/empty2.cipher b/test/data/file/aes256/ctr/empty2.cipher
index e69de29..e69de29 100644
--- a/test/file/aes256/ctr/empty2.cipher
+++ b/test/data/file/aes256/ctr/empty2.cipher
diff --git a/test/file/aes256/ctr/empty2.iv b/test/data/file/aes256/ctr/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes256/ctr/empty2.iv
+++ b/test/data/file/aes256/ctr/empty2.iv
diff --git a/test/file/aes256/ctr/empty2.key b/test/data/file/aes256/ctr/empty2.key
index fd3177c..fd3177c 100644
--- a/test/file/aes256/ctr/empty2.key
+++ b/test/data/file/aes256/ctr/empty2.key
diff --git a/test/file/aes256/ctr/empty2.plain b/test/data/file/aes256/ctr/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes256/ctr/empty2.plain
+++ b/test/data/file/aes256/ctr/empty2.plain
diff --git a/test/file/aes256/ctr/random64k.cipher b/test/data/file/aes256/ctr/random64k.cipher
index e71b2ad..e71b2ad 100644
--- a/test/file/aes256/ctr/random64k.cipher
+++ b/test/data/file/aes256/ctr/random64k.cipher
diff --git a/test/file/aes256/ctr/random64k.iv b/test/data/file/aes256/ctr/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes256/ctr/random64k.iv
+++ b/test/data/file/aes256/ctr/random64k.iv
diff --git a/test/file/aes256/ctr/random64k.key b/test/data/file/aes256/ctr/random64k.key
index c70339d..c70339d 100644
--- a/test/file/aes256/ctr/random64k.key
+++ b/test/data/file/aes256/ctr/random64k.key
diff --git a/test/file/aes256/ctr/random64k.plain b/test/data/file/aes256/ctr/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes256/ctr/random64k.plain
+++ b/test/data/file/aes256/ctr/random64k.plain
diff --git a/test/file/aes256/ctr/singlechar.cipher b/test/data/file/aes256/ctr/singlechar.cipher
index 883ad6e..883ad6e 100644
--- a/test/file/aes256/ctr/singlechar.cipher
+++ b/test/data/file/aes256/ctr/singlechar.cipher
diff --git a/test/file/aes256/ctr/singlechar.iv b/test/data/file/aes256/ctr/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes256/ctr/singlechar.iv
+++ b/test/data/file/aes256/ctr/singlechar.iv
diff --git a/test/file/aes256/ctr/singlechar.key b/test/data/file/aes256/ctr/singlechar.key
index b9badf0..b9badf0 100644
--- a/test/file/aes256/ctr/singlechar.key
+++ b/test/data/file/aes256/ctr/singlechar.key
diff --git a/test/file/aes256/ctr/singlechar.plain b/test/data/file/aes256/ctr/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes256/ctr/singlechar.plain
+++ b/test/data/file/aes256/ctr/singlechar.plain
diff --git a/test/file/aes256/ecb/blocksize-1.cipher b/test/data/file/aes256/ecb/blocksize-1.cipher
index 9a42fb9..9a42fb9 100644
--- a/test/file/aes256/ecb/blocksize-1.cipher
+++ b/test/data/file/aes256/ecb/blocksize-1.cipher
diff --git a/test/file/aes256/ecb/blocksize-1.key b/test/data/file/aes256/ecb/blocksize-1.key
index fd3177c..fd3177c 100644
--- a/test/file/aes256/ecb/blocksize-1.key
+++ b/test/data/file/aes256/ecb/blocksize-1.key
diff --git a/test/file/aes256/ecb/blocksize-1.plain b/test/data/file/aes256/ecb/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes256/ecb/blocksize-1.plain
+++ b/test/data/file/aes256/ecb/blocksize-1.plain
diff --git a/test/file/aes256/ecb/blocksize.cipher b/test/data/file/aes256/ecb/blocksize.cipher
index d11d2b2..d11d2b2 100644
--- a/test/file/aes256/ecb/blocksize.cipher
+++ b/test/data/file/aes256/ecb/blocksize.cipher
diff --git a/test/file/aes256/ecb/blocksize.key b/test/data/file/aes256/ecb/blocksize.key
index 0e7479b..0e7479b 100644
--- a/test/file/aes256/ecb/blocksize.key
+++ b/test/data/file/aes256/ecb/blocksize.key
diff --git a/test/file/aes256/ecb/blocksize.plain b/test/data/file/aes256/ecb/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes256/ecb/blocksize.plain
+++ b/test/data/file/aes256/ecb/blocksize.plain
diff --git a/test/file/aes256/ecb/empty1.cipher b/test/data/file/aes256/ecb/empty1.cipher
index fd6ec3b..fd6ec3b 100644
--- a/test/file/aes256/ecb/empty1.cipher
+++ b/test/data/file/aes256/ecb/empty1.cipher
diff --git a/test/file/aes256/ecb/empty1.key b/test/data/file/aes256/ecb/empty1.key
index 9c7bc66..9c7bc66 100644
--- a/test/file/aes256/ecb/empty1.key
+++ b/test/data/file/aes256/ecb/empty1.key
diff --git a/test/file/aes256/ecb/empty1.plain b/test/data/file/aes256/ecb/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes256/ecb/empty1.plain
+++ b/test/data/file/aes256/ecb/empty1.plain
diff --git a/test/file/aes256/ecb/empty2.cipher b/test/data/file/aes256/ecb/empty2.cipher
index 5193a38..5193a38 100644
--- a/test/file/aes256/ecb/empty2.cipher
+++ b/test/data/file/aes256/ecb/empty2.cipher
diff --git a/test/file/aes256/ecb/empty2.key b/test/data/file/aes256/ecb/empty2.key
index fd3177c..fd3177c 100644
--- a/test/file/aes256/ecb/empty2.key
+++ b/test/data/file/aes256/ecb/empty2.key
diff --git a/test/file/aes256/ecb/empty2.plain b/test/data/file/aes256/ecb/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes256/ecb/empty2.plain
+++ b/test/data/file/aes256/ecb/empty2.plain
diff --git a/test/file/aes256/ecb/random64k.cipher b/test/data/file/aes256/ecb/random64k.cipher
index b6bfe9e..b6bfe9e 100644
--- a/test/file/aes256/ecb/random64k.cipher
+++ b/test/data/file/aes256/ecb/random64k.cipher
diff --git a/test/file/aes256/ecb/random64k.key b/test/data/file/aes256/ecb/random64k.key
index c70339d..c70339d 100644
--- a/test/file/aes256/ecb/random64k.key
+++ b/test/data/file/aes256/ecb/random64k.key
diff --git a/test/file/aes256/ecb/random64k.plain b/test/data/file/aes256/ecb/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes256/ecb/random64k.plain
+++ b/test/data/file/aes256/ecb/random64k.plain
diff --git a/test/file/aes256/ecb/singlechar.cipher b/test/data/file/aes256/ecb/singlechar.cipher
index 31acf26..31acf26 100644
--- a/test/file/aes256/ecb/singlechar.cipher
+++ b/test/data/file/aes256/ecb/singlechar.cipher
diff --git a/test/file/aes256/ecb/singlechar.key b/test/data/file/aes256/ecb/singlechar.key
index b9badf0..b9badf0 100644
--- a/test/file/aes256/ecb/singlechar.key
+++ b/test/data/file/aes256/ecb/singlechar.key
diff --git a/test/file/aes256/ecb/singlechar.plain b/test/data/file/aes256/ecb/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes256/ecb/singlechar.plain
+++ b/test/data/file/aes256/ecb/singlechar.plain
diff --git a/test/file/aes256/ofb/blocksize-1.cipher b/test/data/file/aes256/ofb/blocksize-1.cipher
index 946e96f..946e96f 100644
--- a/test/file/aes256/ofb/blocksize-1.cipher
+++ b/test/data/file/aes256/ofb/blocksize-1.cipher
diff --git a/test/file/aes256/ofb/blocksize-1.iv b/test/data/file/aes256/ofb/blocksize-1.iv
index 62499bf..62499bf 100644
--- a/test/file/aes256/ofb/blocksize-1.iv
+++ b/test/data/file/aes256/ofb/blocksize-1.iv
diff --git a/test/file/aes256/ofb/blocksize-1.key b/test/data/file/aes256/ofb/blocksize-1.key
index fd3177c..fd3177c 100644
--- a/test/file/aes256/ofb/blocksize-1.key
+++ b/test/data/file/aes256/ofb/blocksize-1.key
diff --git a/test/file/aes256/ofb/blocksize-1.plain b/test/data/file/aes256/ofb/blocksize-1.plain
index 13592ee..13592ee 100644
--- a/test/file/aes256/ofb/blocksize-1.plain
+++ b/test/data/file/aes256/ofb/blocksize-1.plain
diff --git a/test/file/aes256/ofb/blocksize.cipher b/test/data/file/aes256/ofb/blocksize.cipher
index c8a5846..c8a5846 100644
--- a/test/file/aes256/ofb/blocksize.cipher
+++ b/test/data/file/aes256/ofb/blocksize.cipher
diff --git a/test/file/aes256/ofb/blocksize.iv b/test/data/file/aes256/ofb/blocksize.iv
index 65aef92..65aef92 100644
--- a/test/file/aes256/ofb/blocksize.iv
+++ b/test/data/file/aes256/ofb/blocksize.iv
diff --git a/test/file/aes256/ofb/blocksize.key b/test/data/file/aes256/ofb/blocksize.key
index 0e7479b..0e7479b 100644
--- a/test/file/aes256/ofb/blocksize.key
+++ b/test/data/file/aes256/ofb/blocksize.key
diff --git a/test/file/aes256/ofb/blocksize.plain b/test/data/file/aes256/ofb/blocksize.plain
index 454f6b3..454f6b3 100644
--- a/test/file/aes256/ofb/blocksize.plain
+++ b/test/data/file/aes256/ofb/blocksize.plain
diff --git a/test/file/aes256/ofb/empty1.cipher b/test/data/file/aes256/ofb/empty1.cipher
index e69de29..e69de29 100644
--- a/test/file/aes256/ofb/empty1.cipher
+++ b/test/data/file/aes256/ofb/empty1.cipher
diff --git a/test/file/aes256/ofb/empty1.iv b/test/data/file/aes256/ofb/empty1.iv
index 445c724..445c724 100644
--- a/test/file/aes256/ofb/empty1.iv
+++ b/test/data/file/aes256/ofb/empty1.iv
diff --git a/test/file/aes256/ofb/empty1.key b/test/data/file/aes256/ofb/empty1.key
index 9c7bc66..9c7bc66 100644
--- a/test/file/aes256/ofb/empty1.key
+++ b/test/data/file/aes256/ofb/empty1.key
diff --git a/test/file/aes256/ofb/empty1.plain b/test/data/file/aes256/ofb/empty1.plain
index e69de29..e69de29 100644
--- a/test/file/aes256/ofb/empty1.plain
+++ b/test/data/file/aes256/ofb/empty1.plain
diff --git a/test/file/aes256/ofb/empty2.cipher b/test/data/file/aes256/ofb/empty2.cipher
index e69de29..e69de29 100644
--- a/test/file/aes256/ofb/empty2.cipher
+++ b/test/data/file/aes256/ofb/empty2.cipher
diff --git a/test/file/aes256/ofb/empty2.iv b/test/data/file/aes256/ofb/empty2.iv
index 65aef92..65aef92 100644
--- a/test/file/aes256/ofb/empty2.iv
+++ b/test/data/file/aes256/ofb/empty2.iv
diff --git a/test/file/aes256/ofb/empty2.key b/test/data/file/aes256/ofb/empty2.key
index fd3177c..fd3177c 100644
--- a/test/file/aes256/ofb/empty2.key
+++ b/test/data/file/aes256/ofb/empty2.key
diff --git a/test/file/aes256/ofb/empty2.plain b/test/data/file/aes256/ofb/empty2.plain
index e69de29..e69de29 100644
--- a/test/file/aes256/ofb/empty2.plain
+++ b/test/data/file/aes256/ofb/empty2.plain
diff --git a/test/file/aes256/ofb/random64k.cipher b/test/data/file/aes256/ofb/random64k.cipher
index 59e34ac..59e34ac 100644
--- a/test/file/aes256/ofb/random64k.cipher
+++ b/test/data/file/aes256/ofb/random64k.cipher
diff --git a/test/file/aes256/ofb/random64k.iv b/test/data/file/aes256/ofb/random64k.iv
index 80328dc..80328dc 100644
--- a/test/file/aes256/ofb/random64k.iv
+++ b/test/data/file/aes256/ofb/random64k.iv
diff --git a/test/file/aes256/ofb/random64k.key b/test/data/file/aes256/ofb/random64k.key
index c70339d..c70339d 100644
--- a/test/file/aes256/ofb/random64k.key
+++ b/test/data/file/aes256/ofb/random64k.key
diff --git a/test/file/aes256/ofb/random64k.plain b/test/data/file/aes256/ofb/random64k.plain
index 1918417..1918417 100644
--- a/test/file/aes256/ofb/random64k.plain
+++ b/test/data/file/aes256/ofb/random64k.plain
diff --git a/test/file/aes256/ofb/singlechar.cipher b/test/data/file/aes256/ofb/singlechar.cipher
index 883ad6e..883ad6e 100644
--- a/test/file/aes256/ofb/singlechar.cipher
+++ b/test/data/file/aes256/ofb/singlechar.cipher
diff --git a/test/file/aes256/ofb/singlechar.iv b/test/data/file/aes256/ofb/singlechar.iv
index ca437db..ca437db 100644
--- a/test/file/aes256/ofb/singlechar.iv
+++ b/test/data/file/aes256/ofb/singlechar.iv
diff --git a/test/file/aes256/ofb/singlechar.key b/test/data/file/aes256/ofb/singlechar.key
index b9badf0..b9badf0 100644
--- a/test/file/aes256/ofb/singlechar.key
+++ b/test/data/file/aes256/ofb/singlechar.key
diff --git a/test/file/aes256/ofb/singlechar.plain b/test/data/file/aes256/ofb/singlechar.plain
index 2e65efe..2e65efe 100644
--- a/test/file/aes256/ofb/singlechar.plain
+++ b/test/data/file/aes256/ofb/singlechar.plain
diff --git a/test/file.py b/test/file.py
index c0cf910..7a02a15 100644
--- a/test/file.py
+++ b/test/file.py
@@ -206,7 +206,7 @@ def _parse_args(args=None):
     parser.add_argument('--force', '-f', action='store_true',
                         help='overwrite ciphertext files')
     parser.add_argument('--suite', '-s', dest='suite_path',
-                        default=os.path.join(_script_dir, 'file'),
+                        default=os.path.join(_script_dir, 'data', 'file'),
                         help='set test suite directory path')
     return parser.parse_args(args)