Merge pull request #450 from nasa/449-remove-kmc_cffi_exclude-and-uses

[#449] remove KMC_CFFI_EXCLUDE

Author: Donnie-Ice

CMakeLists.txt

@@ -60,7 +60,6 @@ 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")
@@ -153,12 +152,10 @@ endif()
 
 IF(KMC_MDB_RH)
     ADD_DEFINITIONS(-DKMC_MDB_RH)
-    ADD_DEFINITIONS(-DKMC_CFFI_EXCLUDE)
 ENDIF(KMC_MDB_RH)
 
 IF(KMC_MDB_DB)
     ADD_DEFINITIONS(-DKMC_MDB_DB)
-    ADD_DEFINITIONS(-DKMC_CFFI_EXCLUDE)
 ENDIF(KMC_MDB_DB)
 
 IF(CRYPTO_EPROC)

docs/wiki/Environment_Building.md

@@ -96,6 +96,5 @@ The two flags (DEBUG and TEST_ENC) can be used simultaneously, or separately.
 
 > * KMC_MDB_RH "KMC-MDB-RedHat-Integration-Testing" -- Default OFF 
 > * KMC_MDB_DB "KMC-MDB-Debian-Integration-Testing" -- Default OFF 
-> * KMC_CFFI_EXCLUDE "KMC-Exclude-Problematic-CFFI-Code" -- Default OFF
 
 > * CRYPTO_EPROC "Enables building of Extended Procedures -- Default OFF (CURRENTLY A WIP - Not ready for Operations)

include/crypto_structs.h

@@ -31,11 +31,9 @@
 #include "common_types.h"
 #endif // Assume build outside of NOS3/cFS infrastructure
 
-#ifndef KMC_CFFI_EXCLUDE // Exclude libraries that CFFI parser can’t process
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
-#endif
 
 /*
 ** Definitions

support/scripts/build_kmc.sh

@@ -11,4 +11,4 @@ source $SCRIPT_DIR/env.sh
 
 rm $BASE_DIR/CMakeCache.txt
 
-cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DCRYPTO_KMC=1 -DKEY_KMC=1 -DMC_DISABLED=1 -DSA_MARIADB=1 -DTEST=1 -DKMC_CFFI_EXCLUDE=1 -DSA_FILE=1 -DKMC_MDB_DB=1 && make && make test
+cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DCRYPTO_KMC=1 -DKEY_KMC=1 -DMC_DISABLED=1 -DSA_MARIADB=1 -DTEST=1 -DSA_FILE=1 -DKMC_MDB_DB=1 && make && make test