Merge branch 'dev' into 379-update-cryptolib-dockerfile

CMakeLists.txt

@@ -171,6 +171,7 @@ endif()
 # Project Specifics
 #
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -g -O0")
+set(CMAKE_CROSSCOMPILING "FALSE")
 
 include_directories(include)
 add_subdirectory(src)

Makefile

@@ -33,3 +33,6 @@ kmc:
 
 wolf:
 	./support/scripts/wolf_docker_build.sh
+
+env:
+	./support/scripts/update_env.sh

include/crypto.h

@@ -160,7 +160,7 @@ void    Crypto_TC_Handle_Padding(uint32_t pkcs_padding, SecurityAssociation_t *s
 int32_t Crypto_TC_Set_IV(SecurityAssociation_t *sa_ptr, uint8_t *p_new_enc_frame, uint16_t *index);
 
 // OCF
-uint32_t Crypto_Get_FSR();
+uint32_t Crypto_Get_FSR(void);
 void     Crypto_Set_FSR(uint8_t *p_ingest, uint16_t byte_idx, uint16_t pdu_len, SecurityAssociation_t *sa_ptr);
 
 // Telemetry (TM)
@@ -176,6 +176,13 @@ extern int32_t Crypto_AOS_ProcessSecurity(uint8_t *p_ingest, uint16_t len_ingest
 // Crypo Error Support Functions
 extern char *Crypto_Get_Error_Code_Enum_String(int32_t crypto_error_code);
 
+/*
+** Internal Prototypes
+*/
+
+int32_t Crypto_Get_Security_Header_Length(SecurityAssociation_t *sa_ptr);
+int32_t Crypto_Get_Security_Trailer_Length(SecurityAssociation_t *sa_ptr);
+
 /*
 ** Internal Prototypes
 */

src/CMakeLists.txt

@@ -131,7 +131,11 @@ if(DEFINED CFE_SYSTEM_PSPNAME)
     set(CMAKE_INSTALL_RPATH "./${INSTALL_SUBDIR}")
     add_cfe_app(crypto ${LIB_SRC_FILES})
     target_include_directories(crypto PUBLIC ../include)
-    install(TARGETS crypto RUNTIME_DEPENDENCIES DESTINATION ${CMAKE_INSTALL_PREFIX}/${TGTSYS_${SYSVAR}}/${INSTALL_SUBDIR})
+    if(NOT CMAKE_CROSSCOMPILING)
+        install(TARGETS crypto RUNTIME_DEPENDENCIES DESTINATION ${CMAKE_INSTALL_PREFIX}/${TGTSYS_${SYSVAR}}/${INSTALL_SUBDIR})
+    else()
+        install(TARGETS crypto)
+    endif()
 else() 
     # Standalone build
     add_library(crypto SHARED ${LIB_SRC_FILES})

src/core/crypto.c

@@ -644,8 +644,8 @@ int32_t Crypto_SEC_MON_CTRL(uint8_t *ingest)
         default:
 #ifdef PDU_DEBUG
             printf(KRED "Error: Crypto_PDU failed interpreting MC Procedure Identification Field! \n" RESET);
-            break;
 #endif
+            break;
     }
     return status;
 }
@@ -1277,7 +1277,7 @@ void Crypto_Set_FSR(uint8_t *p_ingest, uint16_t byte_idx, uint16_t pdu_len, Secu
     }
 }
 
-uint32_t Crypto_Get_FSR()
+uint32_t Crypto_Get_FSR(void)
 {
     uint32_t fsr;
     fsr = (report.cwt << 31) |   // bit(s) 1

src/sa/internal/sa_interface_inmemory.template.c

@@ -73,7 +73,7 @@ SaInterface get_sa_interface_inmemory(void)
  * @brief Function: sa_load_file
  * Loads saved sa_file
  **/
-int32_t sa_load_file()
+int32_t sa_load_file(void)
 {
     FILE   *sa_save_file;
     int32_t status       = CRYPTO_LIB_SUCCESS;