move AES/3DES vectors into mode dirs and separate SHA vectors

commit: 234f3ab0f32a3dca66fa63a3407bedce8084425f [log] [tgz]
author: Paul Kehrer <paul.l.kehrer@gmail.com> Thu Oct 31 12:00:23 2013 -0500
committer: Paul Kehrer <paul.l.kehrer@gmail.com> Thu Oct 31 12:01:21 2013 -0500
tree: 1d4e254be221b4a6d3bdfc8e23eeafa41fa06a62
parent: 9b457dea21096ac3f170c6c49e5acda2ccbf8293 [diff]
diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCIMMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCIMMT1.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT1.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCIMMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCIMMT2.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT2.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCIMMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCIMMT3.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT3.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCIinvperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIinvperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCIinvperm.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIinvperm.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCIpermop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIpermop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCIpermop.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIpermop.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCIsubtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIsubtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCIsubtab.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIsubtab.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCIvarkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvarkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCIvarkey.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvarkey.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCIvartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCIvartext.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvartext.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCMMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCMMT1.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT1.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCMMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCMMT2.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT2.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCMMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCBCMMT3.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT3.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCinvperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCinvperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCinvperm.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCinvperm.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCpermop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCpermop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCpermop.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCpermop.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCsubtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCsubtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCsubtab.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCsubtab.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCvarkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvarkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCvarkey.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvarkey.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCvartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCBCvartext.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvartext.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB1MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB1MMT1.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT1.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB1MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB1MMT2.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT2.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB1MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB1MMT3.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT3.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB1invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB1invperm.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1invperm.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB1permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB1permop.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1permop.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB1subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB1subtab.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1subtab.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB1varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB1varkey.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1varkey.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB1vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB1vartext.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1vartext.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB64MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB64MMT1.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT1.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB64MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB64MMT2.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT2.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB64MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB64MMT3.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT3.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB64invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB64invperm.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64invperm.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB64permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB64permop.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64permop.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB64subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB64subtab.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64subtab.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB64varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB64varkey.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64varkey.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB64vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB64vartext.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64vartext.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB8MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB8MMT1.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT1.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB8MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB8MMT2.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT2.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB8MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFB8MMT3.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT3.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB8invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB8invperm.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8invperm.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB8permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB8permop.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8permop.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB8subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB8subtab.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8subtab.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB8varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB8varkey.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8varkey.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB8vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFB8vartext.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8vartext.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP1MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP1MMT1.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT1.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP1MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP1MMT2.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT2.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP1MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP1MMT3.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT3.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP1invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP1invperm.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1invperm.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP1permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP1permop.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1permop.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP1subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP1subtab.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1subtab.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP1varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP1varkey.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1varkey.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP1vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP1vartext.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1vartext.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP64MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP64MMT1.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT1.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP64MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP64MMT2.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT2.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP64MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP64MMT3.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT3.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP64invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP64invperm.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64invperm.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP64permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP64permop.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64permop.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP64subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP64subtab.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64subtab.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP64varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP64varkey.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64varkey.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP64vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP64vartext.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64vartext.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP8MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP8MMT1.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT1.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP8MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP8MMT2.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT2.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP8MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TCFBP8MMT3.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT3.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP8invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8invperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP8invperm.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8invperm.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP8permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8permop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP8permop.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8permop.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP8subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8subtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP8subtab.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8subtab.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP8varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8varkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP8varkey.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8varkey.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP8vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8vartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TCFBP8vartext.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8vartext.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TECBMMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TECBMMT1.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT1.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TECBMMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TECBMMT2.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT2.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TECBMMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TECBMMT3.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT3.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TECBinvperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBinvperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TECBinvperm.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBinvperm.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TECBpermop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBpermop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TECBpermop.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBpermop.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TECBsubtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBsubtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TECBsubtab.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBsubtab.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TECBvarkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvarkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TECBvarkey.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvarkey.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TECBvartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TECBvartext.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvartext.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBIMMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBIMMT1.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT1.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBIMMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBIMMT2.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT2.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBIMMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBIMMT3.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT3.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBIinvperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIinvperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBIinvperm.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIinvperm.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBIpermop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIpermop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBIpermop.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIpermop.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBIsubtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIsubtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBIsubtab.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIsubtab.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBIvarkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvarkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBIvarkey.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvarkey.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBIvartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBIvartext.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvartext.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBMMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT1.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBMMT1.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT1.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBMMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT2.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBMMT2.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT2.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBMMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT3.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/MMT/TOFBMMT3.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT3.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBinvperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBinvperm.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBinvperm.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBinvperm.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBpermop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBpermop.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBpermop.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBpermop.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBsubtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBsubtab.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBsubtab.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBsubtab.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBvarkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvarkey.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBvarkey.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvarkey.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBvartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvartext.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/3DES/KAT/TOFBvartext.rsp
rename to tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvartext.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCGFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCGFSbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCGFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCGFSbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCGFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCGFSbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCKeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCKeySbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCKeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCKeySbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCKeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCKeySbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CBCMMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CBCMMT128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CBCMMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CBCMMT192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CBCMMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CBCMMT256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarKey128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarKey192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarKey256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarTxt128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarTxt192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CBCVarTxt256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128GFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128GFSbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128GFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128GFSbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128GFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128GFSbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128KeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128KeySbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128KeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128KeySbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128KeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128KeySbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB128MMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB128MMT128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB128MMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB128MMT192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB128MMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB128MMT256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarKey128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarKey192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarKey256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarTxt128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarTxt192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB128VarTxt256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1GFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1GFSbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1GFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1GFSbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1GFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1GFSbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1KeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1KeySbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1KeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1KeySbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1KeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1KeySbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB1MMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB1MMT128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB1MMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB1MMT192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB1MMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB1MMT256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarKey128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarKey192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarKey256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarTxt128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarTxt192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB1VarTxt256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8GFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8GFSbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8GFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8GFSbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8GFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8GFSbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8KeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8KeySbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8KeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8KeySbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8KeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8KeySbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB8MMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB8MMT128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB8MMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB8MMT192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB8MMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/CFB8MMT256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarKey128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarKey192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarKey256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarTxt128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarTxt192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/CFB8VarTxt256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBGFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBGFSbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBGFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBGFSbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBGFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBGFSbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBKeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBKeySbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBKeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBKeySbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBKeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBKeySbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/ECBMMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/ECBMMT128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/ECBMMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/ECBMMT192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/ECBMMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/ECBMMT256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarKey128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarKey192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarKey256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarTxt128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarTxt192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/ECBVarTxt256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmDecrypt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmDecrypt128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmDecrypt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmDecrypt192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmDecrypt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmDecrypt256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmEncryptExtIV128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmEncryptExtIV128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmEncryptExtIV192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmEncryptExtIV192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmEncryptExtIV256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/gcmtestvectors/gcmEncryptExtIV256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBGFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBGFSbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBGFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBGFSbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBGFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBGFSbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBKeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBKeySbox128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBKeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBKeySbox192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBKeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBKeySbox256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/OFBMMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/OFBMMT128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/OFBMMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/OFBMMT192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/MMT/OFBMMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/MMT/OFBMMT256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarKey128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarKey192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarKey256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarTxt128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt192.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarTxt192.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt192.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/KAT/OFBVarTxt256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/XTSTestVectors/tweak-128hexstr/XTSGenAES128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/XTSTestVectors/tweak-128hexstr/XTSGenAES128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/XTSTestVectors/tweak-128hexstr/XTSGenAES256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/XTSTestVectors/tweak-128hexstr/XTSGenAES256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES256.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/XTSTestVectors/tweak-dataunitseqno/XTSGenAES128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES128.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/XTSTestVectors/tweak-dataunitseqno/XTSGenAES128.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES128.rsp


diff --git a/tests/hazmat/primitives/vectors/ciphers/AES/XTSTestVectors/tweak-dataunitseqno/XTSGenAES256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES256.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/ciphers/AES/XTSTestVectors/tweak-dataunitseqno/XTSGenAES256.rsp
rename to tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES256.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/Readme.txt b/tests/hazmat/primitives/vectors/hashes/SHA1/Readme.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/Readme.txt
rename to tests/hazmat/primitives/vectors/hashes/SHA1/Readme.txt


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1LongMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1LongMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1LongMsg.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA1/SHA1LongMsg.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1Monte.rsp b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1Monte.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1Monte.txt b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1Monte.txt
rename to tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.txt


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1ShortMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1ShortMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1ShortMsg.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA1/SHA1ShortMsg.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/Readme.txt b/tests/hazmat/primitives/vectors/hashes/SHA2/Readme.txt
similarity index 100%
copy from tests/hazmat/primitives/vectors/hashes/SHABYTE/Readme.txt
copy to tests/hazmat/primitives/vectors/hashes/SHA2/Readme.txt


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224LongMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224LongMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224LongMsg.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA224LongMsg.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224Monte.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224Monte.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224Monte.txt b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224Monte.txt
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.txt


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224ShortMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224ShortMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224ShortMsg.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA224ShortMsg.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256LongMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256LongMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256LongMsg.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA256LongMsg.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256Monte.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256Monte.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256Monte.txt b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256Monte.txt
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.txt


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256ShortMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256ShortMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256ShortMsg.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA256ShortMsg.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384LongMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384LongMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384LongMsg.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA384LongMsg.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384Monte.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384Monte.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384Monte.txt b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384Monte.txt
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.txt


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384ShortMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384ShortMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384ShortMsg.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA384ShortMsg.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512LongMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512LongMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512LongMsg.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA512LongMsg.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512Monte.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512Monte.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.rsp


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512Monte.txt b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.txt
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512Monte.txt
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.txt


diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512ShortMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512ShortMsg.rsp
similarity index 100%
rename from tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512ShortMsg.rsp
rename to tests/hazmat/primitives/vectors/hashes/SHA2/SHA512ShortMsg.rsp
commit	234f3ab0f32a3dca66fa63a3407bedce8084425f	[log] [tgz]
author	Paul Kehrer <paul.l.kehrer@gmail.com>	Thu Oct 31 12:00:23 2013 -0500
committer	Paul Kehrer <paul.l.kehrer@gmail.com>	Thu Oct 31 12:01:21 2013 -0500
tree	1d4e254be221b4a6d3bdfc8e23eeafa41fa06a62
parent	9b457dea21096ac3f170c6c49e5acda2ccbf8293 [diff]