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

22 files changed, 17 insertions, 0 deletions

diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/Readme.txt b/tests/hazmat/primitives/vectors/hashes/SHA1/Readme.txt
index de6b122e..de6b122e 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/Readme.txt
+++ b/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
index ef0e21bc..ef0e21bc 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1LongMsg.rsp
+++ b/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
index 5088defa..5088defa 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1Monte.rsp
+++ b/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
index 37cf7a82..37cf7a82 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1Monte.txt
+++ b/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
index 35aa9b5f..35aa9b5f 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA1ShortMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1ShortMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/Readme.txt b/tests/hazmat/primitives/vectors/hashes/SHA2/Readme.txt
new file mode 100755
index 00000000..de6b122e
--- /dev/null
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/Readme.txt
@@ -0,0 +1,17 @@
+There are two sets of SHA example files:

+

+1. The response (.rsp) files contain properly formatted CAVS response files.

+

+2. The intermediate value (.txt) files for the Monte Carlo tests contain

+   values for the inner loop as shown in the pseudocode in Figure 1 on page 9

+   of the SHA Validation System.  The inner loop variable 'i' ranges in value

+   from 3 to 1002.  The intermediate values for the first five iterations of

+   the inner loop therefore correspond to 'i' values of 3 to 7. The message (M)

+   and the message digest (MDi) for each of these i are printed out, indented

+   by one tab space.  The final message digest (MD), not indented, is the last

+   value printed for each count.

+

+   

+The SHA Validation System document can be found at:

+

+http://csrc.nist.gov/groups/STM/cavp/documents/shs/SHAVS.pdf.
\ No newline at end of file
diff --git a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224LongMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224LongMsg.rsp
index 09497b4f..09497b4f 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224LongMsg.rsp
+++ b/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
index 50648b8d..50648b8d 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224Monte.rsp
+++ b/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
index 1c500e32..1c500e32 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224Monte.txt
+++ b/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
index a4542c38..a4542c38 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA224ShortMsg.rsp
+++ b/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
index 967db2e4..967db2e4 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256LongMsg.rsp
+++ b/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
index bda7a9e4..bda7a9e4 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256Monte.rsp
+++ b/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
index 27a161e2..27a161e2 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256Monte.txt
+++ b/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
index ddcfefbd..ddcfefbd 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA256ShortMsg.rsp
+++ b/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
index 4d8404bc..4d8404bc 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384LongMsg.rsp
+++ b/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
index c7c30e7a..c7c30e7a 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384Monte.rsp
+++ b/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
index a548cbce..a548cbce 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384Monte.txt
+++ b/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
index 15fd9adf..15fd9adf 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA384ShortMsg.rsp
+++ b/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
index c601ed15..c601ed15 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512LongMsg.rsp
+++ b/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
index 0b9c295a..0b9c295a 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512Monte.rsp
+++ b/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
index 5753952d..5753952d 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512Monte.txt
+++ b/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
index ab5cd2a1..ab5cd2a1 100755
--- a/tests/hazmat/primitives/vectors/hashes/SHABYTE/SHA512ShortMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512ShortMsg.rsp