created permutations subdir for keccak-fips

randombit · Jun 13, 2023 · 6833325 · 6833325
1 parent d1a15ea
commit 6833325
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 11 deletions.
diff --git a/src/build-data/policy/bsi.txt b/src/build-data/policy/bsi.txt
@@ -72,7 +72,7 @@ sha2_32_x86
 sha2_32_armv8
 sha2_32_bmi2
 sha2_64_bmi2
-sha3_bmi2
+keccak_fips_bmi2
 
 # entropy sources
 getentropy

diff --git a/src/build-data/policy/modern.txt b/src/build-data/policy/modern.txt
@@ -71,7 +71,7 @@ sha2_32_x86
 sha2_32_armv8
 sha2_32_bmi2
 sha2_64_bmi2
-sha3_bmi2
+keccak_fips_bmi2
 
 simd
 

diff --git a/src/build-data/policy/nist.txt b/src/build-data/policy/nist.txt
@@ -56,7 +56,7 @@ sha2_32_x86
 sha2_32_armv8
 sha2_32_bmi2
 sha2_64_bmi2
-sha3_bmi2
+keccak_fips_bmi2
 
 # modes
 ghash_cpu

diff --git a/src/lib/hash/keccak/info.txt b/src/lib/hash/keccak/info.txt
@@ -7,5 +7,5 @@ name -> "Keccak"
 </module_info>
 
 <requires>
-sha3
+keccak_fips
 </requires>
diff --git a/src/lib/hash/sha3/info.txt b/src/lib/hash/sha3/info.txt
@@ -5,3 +5,8 @@ SHA3 -> 20161018
 <module_info>
 name -> "SHA-3"
 </module_info>
+
+
+<requires>
+keccak_fips
+</requires>
diff --git a/src/lib/hash/shake/info.txt b/src/lib/hash/shake/info.txt
@@ -7,5 +7,5 @@ name -> "SHAKE"
 </module_info>
 
 <requires>
-sha3
+keccak_fips
 </requires>
diff --git a/src/lib/mac/kmac/info.txt b/src/lib/mac/kmac/info.txt
@@ -7,6 +7,6 @@ name -> "KMAC"
 </module_info>
 
 <requires>
-sha3
+keccak_fips
 </requires>
 
diff --git a/src/lib/permutations/keccak_fips/info.txt b/src/lib/permutations/keccak_fips/info.txt
@@ -0,0 +1,7 @@
+<defines>
+KECCAK_FIPS -> 20230613
+</defines>
+
+<module_info>
+name -> "Keccak-FIPS"
+</module_info>
diff --git a/src/lib/hash/sha3/keccak_fips.cpp → .../permutations/keccak_fips/keccak_fips.cpp b/src/lib/hash/sha3/keccak_fips.cpp → .../permutations/keccak_fips/keccak_fips.cpp
diff --git a/src/lib/hash/sha3/keccak_fips.h → ...ib/permutations/keccak_fips/keccak_fips.h b/src/lib/hash/sha3/keccak_fips.h → ...ib/permutations/keccak_fips/keccak_fips.h
@@ -108,7 +108,7 @@ class Keccak_FIPS final {
       void permute();
 
    private:
-#if defined(BOTAN_HAS_SHA3_BMI2)
+#if defined(BOTAN_HAS_KECCAK_FIPS_BMI2)
       static void permute_bmi2(uint64_t A[25]);
 #endif
 

diff --git a/src/lib/hash/sha3/sha3_bmi2/info.txt → ...ons/keccak_fips/keccak_fips_bmi2/info.txt b/src/lib/hash/sha3/sha3_bmi2/info.txt → ...ons/keccak_fips/keccak_fips_bmi2/info.txt
@@ -1,10 +1,10 @@
 <defines>
-SHA3_BMI2 -> 20190117
+KECCAK_FIPS_BMI2 -> 20230612
 </defines>
 
 <module_info>
-name -> "SHA-3 BMI2"
-brief -> "SHA-3 using BMI2 instructions"
+name -> "KECCAK-FIPS BMI2"
+brief -> "KECCAK-FIPS for SHA-3-related functions using BMI2 instructions"
 </module_info>
 
 <isa>

diff --git a/.../hash/sha3/sha3_bmi2/keccak_fips_bmi2.cpp → ...ips/keccak_fips_bmi2/keccak_fips_bmi2.cpp b/.../hash/sha3/sha3_bmi2/keccak_fips_bmi2.cpp → ...ips/keccak_fips_bmi2/keccak_fips_bmi2.cpp
diff --git a/src/lib/hash/sha3/keccak_fips_round.h → ...mutations/keccak_fips/keccak_fips_round.h b/src/lib/hash/sha3/keccak_fips_round.h → ...mutations/keccak_fips/keccak_fips_round.h
diff --git a/src/lib/stream/shake_cipher/info.txt b/src/lib/stream/shake_cipher/info.txt
@@ -8,5 +8,5 @@ brief -> "SHAKE-128 and SHAKE-256 XOF presented as stream ciphers"
 </module_info>
 
 <requires>
-sha3
+keccak_fips
 </requires>