clang-format

ingonyama-zk · Aug 26, 2024 · b936298 · b936298
1 parent 83cdd50
commit b936298
Show file tree

Hide file tree

Showing 4 changed files with 201 additions and 265 deletions.
diff --git a/icicle/backend/cpu/include/hash/keccak/keccak.h b/icicle/backend/cpu/include/hash/keccak/keccak.h
@@ -8,16 +8,15 @@ using namespace icicle;
 
 namespace keccak_cpu {
 
-#define SHA3_ASSERT( x )
-#define SHA3_TRACE( format, ...)
+#define SHA3_ASSERT(x)
+#define SHA3_TRACE(format, ...)
 #define SHA3_TRACE_BUF(format, buf, l)
 
-/* 
+/*
  * This flag is used to configure "pure" Keccak, as opposed to NIST SHA3.
  */
 #define SHA3_USE_KECCAK_FLAG 0x80000000
-#define SHA3_CW(x) ((x) & (~SHA3_USE_KECCAK_FLAG))
-
+#define SHA3_CW(x)           ((x) & (~SHA3_USE_KECCAK_FLAG))
 
 #if defined(_MSC_VER)
 #define SHA3_CONST(x) x
@@ -26,62 +25,56 @@ namespace keccak_cpu {
 #endif
 
 #ifndef SHA3_ROTL64
-#define SHA3_ROTL64(x, y) \
-	(((x) << (y)) | ((x) >> ((sizeof(uint64_t)*8) - (y))))
+#define SHA3_ROTL64(x, y) (((x) << (y)) | ((x) >> ((sizeof(uint64_t) * 8) - (y))))
 #endif
 
 /* 'Words' here refers to uint64_t */
 #define SHA3_KECCAK_SPONGE_WORDS (((1600) / 8) / sizeof(uint64_t))
 
+  enum SHA3_FLAGS { SHA3_FLAGS_SHA3 = 0, SHA3_FLAGS_KECCAK = 1 };
 
-enum SHA3_FLAGS {
-    SHA3_FLAGS_SHA3 = 0,
-    SHA3_FLAGS_KECCAK = 1
-};
-
-enum SHA3_RETURN {
-    SHA3_RETURN_OK = 0,
-    SHA3_RETURN_BAD_PARAMS = 1
-};
-typedef enum SHA3_RETURN sha3_return_t;
+  enum SHA3_RETURN { SHA3_RETURN_OK = 0, SHA3_RETURN_BAD_PARAMS = 1 };
+  typedef enum SHA3_RETURN sha3_return_t;
 
-class Keccak : public Hash {
-public:
+  class Keccak : public Hash
+  {
+  public:
     // Constructor
     explicit Keccak(int total_input_limbs, int total_output_limbs, enum SHA3_FLAGS flag)
-        : Hash(total_input_limbs, total_output_limbs), sha_flag(flag) 
-        {}
-    const size_t bitSize = this->m_total_output_limbs*sizeof(limb_t)*8;
+        : Hash(total_input_limbs, total_output_limbs), sha_flag(flag)
+    {
+    }
+    const size_t bitSize = this->m_total_output_limbs * sizeof(limb_t) * 8;
     const enum SHA3_FLAGS sha_flag;
 
-    eIcicleError
-    run_single_hash(const limb_t* input_limbs, limb_t* output_limbs, const HashConfig& config, const limb_t* secondery_input_limbs = nullptr) const override;
+    eIcicleError run_single_hash(
+      const limb_t* input_limbs,
+      limb_t* output_limbs,
+      const HashConfig& config,
+      const limb_t* secondery_input_limbs = nullptr) const override;
     eIcicleError run_multiple_hash(
       const limb_t* input_limbs,
       limb_t* output_limbs,
       int nof_hashes,
       const HashConfig& config,
       const limb_t* secondery_input_limbs = nullptr) const override;
 
-
-private:
-
+  private:
     static const uint64_t keccakf_rndc[24];
     static const unsigned keccakf_rotc[24];
     static const unsigned keccakf_piln[24];
 
     // SHA-3 context structure
     struct sha3_context {
-        uint64_t saved;  // the portion of the input message that we didn't consume yet
-        union {          // Keccak's state
-            uint64_t s[SHA3_KECCAK_SPONGE_WORDS];
-            uint8_t sb[SHA3_KECCAK_SPONGE_WORDS * 8];
-        } u;
-        unsigned byteIndex;     // 0..7--the next byte after the set one
-        unsigned wordIndex;     // 0..24--the next word to integrate input
-        unsigned capacityWords; // the double size of the hash output in words
+      uint64_t saved; // the portion of the input message that we didn't consume yet
+      union {         // Keccak's state
+        uint64_t s[SHA3_KECCAK_SPONGE_WORDS];
+        uint8_t sb[SHA3_KECCAK_SPONGE_WORDS * 8];
+      } u;
+      unsigned byteIndex;     // 0..7--the next byte after the set one
+      unsigned wordIndex;     // 0..24--the next word to integrate input
+      unsigned capacityWords; // the double size of the hash output in words
     };
-
 
     // Functions
     sha3_return_t sha3_Init(sha3_context* ctx, unsigned bitSize) const;
@@ -95,52 +88,37 @@ class Keccak : public Hash {
 
     // Single-call hashing
     sha3_return_t sha3_HashBuffer(
-        unsigned bitSize,      // 256, 384, 512
-        SHA3_FLAGS flags,      // SHA3_FLAGS_NONE or SHA3_FLAGS_KECCAK
-        const void* in, unsigned inBytes,
-        void* out, unsigned outBytes // up to bitSize/8; truncation OK
+      unsigned bitSize, // 256, 384, 512
+      SHA3_FLAGS flags, // SHA3_FLAGS_NONE or SHA3_FLAGS_KECCAK
+      const void* in,
+      unsigned inBytes,
+      void* out,
+      unsigned outBytes // up to bitSize/8; truncation OK
     ) const;
-
-};
-
-
+  };
 
   class Keccak256 : public Keccak
   {
   public:
-    Keccak256(int total_input_limbs)
-        : Keccak(
-            total_input_limbs, 256 /(8* sizeof(limb_t)),SHA3_FLAGS_KECCAK)
-    {
-    }
+    Keccak256(int total_input_limbs) : Keccak(total_input_limbs, 256 / (8 * sizeof(limb_t)), SHA3_FLAGS_KECCAK) {}
   };
 
   class Keccak512 : public Keccak
   {
   public:
-    Keccak512(int total_input_limbs)
-        : Keccak(
-            total_input_limbs, 512 /(8* sizeof(limb_t)),SHA3_FLAGS_KECCAK)
-    {
-    }
+    Keccak512(int total_input_limbs) : Keccak(total_input_limbs, 512 / (8 * sizeof(limb_t)), SHA3_FLAGS_KECCAK) {}
   };
 
   class Sha3_256 : public Keccak
   {
   public:
-    Sha3_256(int total_input_limbs)
-        : Keccak(
-            total_input_limbs, 256 /(8* sizeof(limb_t)),SHA3_FLAGS_SHA3)
-    {
-    }
+    Sha3_256(int total_input_limbs) : Keccak(total_input_limbs, 256 / (8 * sizeof(limb_t)), SHA3_FLAGS_SHA3) {}
   };
 
   class Sha3_512 : public Keccak
   {
   public:
-    Sha3_512(int total_input_limbs)
-        : Keccak(
-            total_input_limbs, 512 /(8* sizeof(limb_t)),SHA3_FLAGS_SHA3){}
+    Sha3_512(int total_input_limbs) : Keccak(total_input_limbs, 512 / (8 * sizeof(limb_t)), SHA3_FLAGS_SHA3) {}
   };
 
 } // namespace keccak_cpu