HSM: Change directory name for easier integration

Author: TehilaTheStudent

hsm/.gitignore hsm-server/.gitignorehsm/.gitignore renamed to hsm-server/.gitignore

@@ -10,7 +10,7 @@
 
 #clangd
 .cache
-
+.clang-format
 # VS Code files
 .vscode/
 .devcontainer/

hsm/CMakeLists.txt hsm-server/CMakeLists.txthsm/CMakeLists.txt renamed to hsm-server/CMakeLists.txt

@@ -10,7 +10,7 @@ if(NOT GMP_INCLUDE_DIR OR NOT GMP_LIBRARY OR NOT GMPXX_LIBRARY)
 endif()
 include_directories(${GMP_INCLUDE_DIR})
 # Specify C++ standard
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # Find Protobuf and gRPC packages
 find_package(Protobuf REQUIRED)
@@ -72,4 +72,4 @@ add_dependencies(grpc_server proto_gen)
 set(CMAKE_BUILD_TYPE Debug)
 # Add debug flags
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")

hsm/Dockerfile hsm-server/Dockerfilehsm/Dockerfile renamed to hsm-server/Dockerfile

@@ -0,0 +1,15 @@
+#ifndef IHASH_H
+#define IHASH_H
+#include "general.h"
+#include <cstdint>
+#include <vector>
+
+class IHash {
+   public:
+    enum SHAAlgorithm { SHA256, SHA3_512 };
+    virtual CK_RV update(const std::vector<uint8_t> &data) = 0;
+    virtual CK_RV finalize(std::vector<uint8_t> &output) = 0;
+    virtual ~IHash() = default;
+};
+
+#endif  // IHASH_H

hsm/docker-compose.yml hsm-server/docker-compose.ymlhsm/docker-compose.yml renamed to hsm-server/docker-compose.yml

@@ -0,0 +1,32 @@
+#ifndef SHA3_512_H
+#define SHA3_512_H
+
+#include "IHash.h"
+#include "general.h"
+#include <cstdint>  // For fixed-width integer types
+#include <sstream>  // For std::ostringstream
+#include <string>
+#include <vector>
+
+class SHA3_512 : public IHash {
+   public:
+    SHA3_512();  // Constructor to initialize the state
+    CK_RV update(const std::vector<uint8_t> &data)
+        override;  // Update the hash with more data
+    CK_RV finalize(std::vector<uint8_t> &output)
+        override;  // Finalize and get the hash value
+
+   private:
+    uint64_t S[5][5];           // State matrix
+    uint8_t buffer[576];        // Buffer to hold input data
+    std::size_t buffer_length;  // Current length of data in the buffer
+
+    void round(uint64_t A[5][5], uint64_t RC);
+    void f_function(uint64_t A[5][5]);
+    void padding(uint8_t input[], std::size_t &in_len, int &absorb_times);
+    void assign_S_xor_p(uint64_t S[5][5], uint64_t *p);
+    void endianSwap(uint64_t &x);
+    std::vector<uint8_t> hashPartToHexVector(uint64_t S[5][5]);
+};
+
+#endif  // SHA3_512_H

hsm-server/include/IHash.h

@@ -10,22 +10,22 @@
 #define NUM_BLOCKS 4
 #define BLOCK_BYTES_LEN (AES_STATE_ROWS * (NUM_BLOCKS) * sizeof(unsigned char))
 
-
 struct AESData {
     unsigned int numWord;
     unsigned int numRound;
     unsigned int keySize;
 };
 
-
 static std::map<AESKeyLength, AESData> aesKeyLengthData = {
     {AESKeyLength::AES_128, {4, 10, 16}},
     {AESKeyLength::AES_192, {6, 12, 24}},
     {AESKeyLength::AES_256, {8, 14, 32}}};
 
 unsigned int getPaddedLength(unsigned int originalLength);
-void padMessage(unsigned char *originalMessage, unsigned int originalLength,unsigned char * paddedMessage);
-unsigned int getUnpadMessageLength(unsigned char *message,unsigned int paddedLength);
+void padMessage(unsigned char *originalMessage, unsigned int originalLength,
+                unsigned char *paddedMessage);
+unsigned int getUnpadMessageLength(unsigned char *message,
+                                   unsigned int paddedLength);
 void addRoundKey(unsigned char state[AES_STATE_ROWS][NUM_BLOCKS],
                  unsigned char *roundKey);
 void checkLength(unsigned int length);
@@ -51,7 +51,8 @@ void xorBlocks(const unsigned char *a, const unsigned char *b, unsigned char *c,
 void generateRandomIV(unsigned char *iv);
 size_t calculatEncryptedLenAES(size_t inLen, bool isFirst,
                                AESChainingMode chainingMode);
-size_t calculatDecryptedLenAES(size_t inLen, bool isFirst,AESChainingMode chainingMode);
+size_t calculatDecryptedLenAES(size_t inLen, bool isFirst,
+                               AESChainingMode chainingMode);
 void generateKey(unsigned char *, AESKeyLength keyLength);
 
 /*Inverse S-Box*/

hsm-server/include/SHA3-512.h

@@ -11,7 +11,10 @@ class StreamAES {
     unsigned char *key = nullptr;
     unsigned char *lastData = nullptr;
 
-    StreamAES() : iv(new unsigned char[16]), lastBlock(new unsigned char[16]), lastData(new unsigned char[16]){};
+    StreamAES()
+        : iv(new unsigned char[16]),
+          lastBlock(new unsigned char[16]),
+          lastData(new unsigned char[16]){};
     virtual ~StreamAES()
     {
         if (iv != nullptr) {

hsm/include/aes.h hsm-server/include/aes.hhsm/include/aes.h renamed to hsm-server/include/aes.h

@@ -6,15 +6,14 @@
 /**
  * @brief Singleton class for managing StreamAESFactory instances.
  */
-class FactoryManager 
-{
+class FactoryManager {
    public:
     /**
      * @brief Gets the singleton instance of FactoryManager.
      * 
      * @return The singleton instance of FactoryManager.
      */
-    static FactoryManager& getInstance() 
+    static FactoryManager &getInstance()
     {
         static FactoryManager instance;
         return instance;
@@ -26,24 +25,22 @@ class FactoryManager
      * @param type The AES chaining mode.
      * @return A pointer to the newly created StreamAES object.
      */
-    StreamAES* create(const AESChainingMode& type) const 
+    StreamAES *create(const AESChainingMode &type) const
     {
         auto it = factories.find(type);
-        if (it != factories.end()) 
+        if (it != factories.end())
             return it->second;
-        
+
         return nullptr;
     }
 
    private:
-    std::map<AESChainingMode, StreamAES*> factories = 
-    {
-      {AESChainingMode::ECB, new AESEcb()},
-      {AESChainingMode::CBC, new AESCbc()},
-      {AESChainingMode::CFB, new AESCfb()},
-      {AESChainingMode::OFB, new AESOfb()},
-      {AESChainingMode::CTR, new AESCtr()}
-    };
+    std::map<AESChainingMode, StreamAES *> factories = {
+        {AESChainingMode::ECB, new AESEcb()},
+        {AESChainingMode::CBC, new AESCbc()},
+        {AESChainingMode::CFB, new AESCfb()},
+        {AESChainingMode::OFB, new AESOfb()},
+        {AESChainingMode::CTR, new AESCtr()}};
 
     /**
      * @brief Private constructor for singleton pattern.