aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-08-26 15:10:04 -0400
committerJack Lloyd <[email protected]>2018-08-26 15:10:04 -0400
commitaf823efc383b75a93202a4ef10de5737a4746150 (patch)
tree8e37c4f7a711ddad36532b65a4cfafba6d74bd6b
parenta98073be4366029d25eb6a01e7c4edf48cc75817 (diff)
Correct order of CPUID bit clearings
These are done from left to right, so should end with most widely implement extensions. Noticed because adding AVX2 ChaCha caused SSE2 ChaCha to be no longer tested.
-rw-r--r--src/tests/data/block/serpent.vec2
-rw-r--r--src/tests/data/block/shacal2.vec2
-rw-r--r--src/tests/data/hash/sha1.vec2
-rw-r--r--src/tests/data/mac/gmac.vec2
-rw-r--r--src/tests/data/stream/chacha.vec2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/tests/data/block/serpent.vec b/src/tests/data/block/serpent.vec
index 272519236..1009251ba 100644
--- a/src/tests/data/block/serpent.vec
+++ b/src/tests/data/block/serpent.vec
@@ -1,5 +1,5 @@
-#test cpuid simd avx2
+#test cpuid avx2 simd
[Serpent]
Key = 00000000000000000000000000000000
diff --git a/src/tests/data/block/shacal2.vec b/src/tests/data/block/shacal2.vec
index ed3fdde11..24138d80c 100644
--- a/src/tests/data/block/shacal2.vec
+++ b/src/tests/data/block/shacal2.vec
@@ -1,4 +1,4 @@
-#test cpuid sse2 intel_sha
+#test cpuid intel_sha sse2
[SHACAL2]
diff --git a/src/tests/data/hash/sha1.vec b/src/tests/data/hash/sha1.vec
index ebaec1613..42526f2f0 100644
--- a/src/tests/data/hash/sha1.vec
+++ b/src/tests/data/hash/sha1.vec
@@ -1,4 +1,4 @@
-#test cpuid sse2 intel_sha armv8sha1
+#test cpuid intel_sha armv8sha1 sse2
[SHA-160]
In =
diff --git a/src/tests/data/mac/gmac.vec b/src/tests/data/mac/gmac.vec
index b6299137d..feb48b3e8 100644
--- a/src/tests/data/mac/gmac.vec
+++ b/src/tests/data/mac/gmac.vec
@@ -1,4 +1,4 @@
-#test cpuid aesni ssse3 clmul pmull
+#test cpuid aesni clmul pmull ssse3
# Testvectors in this file have been generated using the Bouncy Castle Crypto
# API version 1.54 (https://www.bouncycastle.org)
diff --git a/src/tests/data/stream/chacha.vec b/src/tests/data/stream/chacha.vec
index 79fabaad5..09b17b6ab 100644
--- a/src/tests/data/stream/chacha.vec
+++ b/src/tests/data/stream/chacha.vec
@@ -1,5 +1,5 @@
-#test cpuid sse2 avx2
+#test cpuid avx2 sse2
[ChaCha(8)]