[#430] Added more commonly changed defines to build flags

Author: Donnie-Ice

CMakeLists.txt

@@ -56,30 +56,37 @@ option(SA_MARIADB "Security Association - MariaDB" OFF)
 option(SUPPORT "Support" OFF)
 option(SYSTEM_INSTALL "SystemInstall" OFF)
 option(TEST "Test" OFF)
-# option(TEST_ENC "Tests - Encryption" OFF)
 option(SA_FILE "Save Security Association to File" OFF)
 option(KEY_VALIDATION "Validate existance of key duplication" OFF)
-
 OPTION(KMC_MDB_RH "KMC-MDB-RedHat-Integration-Testing" OFF) #Disabled by default, enable with: -DKMC_MDB_RH=ON
 OPTION(KMC_MDB_DB "KMC-MDB-Debian-Integration-Testing" OFF) #Disabled by default, enable with: -DKMC_MDB_DB=ON
 OPTION(KMC_CFFI_EXCLUDE "KMC-Exclude-Problematic-CFFI-Code" OFF) #Disabled by default, enable with: -DKMC_CFFI_EXCLUDE=ON
-
 OPTION(CRYPTO_EPROC "Enables the building and use of Extended Procedures" OFF) #Disabled by default, enable with -DCRYPTO_EPROC=ON
+
 OPTION(MAC_SIZE "The size of the max MAC buffer in bytes")
 OPTION(IV_SIZE "The size of the max IV buffer in bytes")
+Option(NUM_SA "The max number of SAs that will be used")
+Option(NUM_KEYS "The max number of keys that will be used")
 
 #
-# Max Buffer Size Defines
+# Max Size Defines
 #
+if(NUM_SA)
+    add_compile_definitions(NUM_SA=${NUM_SA})
+    message(STATUS "NUM_SA set to: ${NUM_SA}")
+endif()
 if(MAC_SIZE)
     add_compile_definitions(MAC_SIZE=${MAC_SIZE})
     message(STATUS "MAC_SIZE set to: ${MAC_SIZE}")
 endif()
-
 if(IV_SIZE)
     add_compile_definitions(IV_SIZE=${IV_SIZE})
     message(STATUS "IV_SIZE set to: ${IV_SIZE}")
 endif()
+if(NUM_KEYS)
+    add_compile_definitions(NUM_KEYS=${NUM_KEYS})
+    message(STATUS "NUM_KEYS set to: ${NUM_KEYS}")
+endif()
 
 #
 # Custom Module Paths

include/crypto_config.h

@@ -108,25 +108,17 @@
 #define SA_AUTHENTICATED_ENCRYPTION 3
 
 // Generic Defines
-#define NUM_SA              64
 #define SPI_LEN             2 /* bytes */
 #define SPI_MIN             0
 #define SPI_MAX             NUM_SA - 1
 #define KEY_SIZE            512 /* bytes */
 #define KEY_ID_SIZE         8
 #define MKID_MAX            128
-#define NUM_KEYS            256
 #define DISABLED            0
 #define ENABLED             1
-#ifndef IV_SIZE
-   #define IV_SIZE          16 /* TM IV size bytes */
-#endif
 #define IV_SIZE_TC          4  /* TC IV size bytes */
 #define REF_SIZE            250
 #define OCF_SIZE            4
-#ifndef MAC_SIZE
-   #define MAC_SIZE         16 /* bytes */
-#endif
 #define FHECF_SIZE          2
 #define FECF_SIZE           2
 #define TC_SEGMENT_HDR_SIZE 1
@@ -142,6 +134,20 @@
 #define CRYPTOLIB_APPID     128
 #define MAX_IV_LEN          32   /* bytes */
 
+// Configurable via build flags
+#ifndef NUM_SA
+   #define NUM_SA              64
+#endif
+#ifndef MAC_SIZE
+   #define MAC_SIZE            16 /* bytes */
+#endif
+#ifndef IV_SIZE
+   #define IV_SIZE             16 /* TM IV size bytes */
+#endif
+#ifndef NUM_KEYS
+   #define NUM_KEYS            256
+#endif
+
 // Monitoring and Control Defines
 #define EMV_SIZE 4  /* bytes */
 #define LOG_SIZE 50 /* packets */