Skip to content

[WIP] 769 cryptolib otar #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Donnie-Ice wants to merge 20 commits into
base: dev
Choose a base branch
from
Draft

[WIP] 769 cryptolib otar #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4f4f362
Saving WIP, modified config files
Donnie-Ice Jul 30, 2025
7632c64
[nasa/nos3#769] Restore NOS3 defaults and update submods
Donnie-Ice Aug 4, 2025
53a0bed
[nasa/nos3#769] Bring in Active VCID PR changes for testing
Donnie-Ice Aug 4, 2025
0e8cfa1
[nasa/nos3#769] All ExProc Commands working
Donnie-Ice Aug 5, 2025
5b4a53b
[nasa/nos3#769] Fixed Crypto debug print, ExProc states in commands
Donnie-Ice Aug 5, 2025
76682e8
[nasa/nos3#769] Update submod pointers
Donnie-Ice Aug 6, 2025
de50b22
[nasa/nos3#754] Add YAMCS cmd def for TO_SET_TM_VC
Donnie-Ice Aug 7, 2025
7210a8f
Revert "[nasa/nos3#754] Add YAMCS cmd def for TO_SET_TM_VC"
Donnie-Ice Aug 7, 2025
893970d
[nasa/nos3#769] Ensure yamcs is on dev after accidental commit
Donnie-Ice Aug 7, 2025
683f751
[nasa/nos3#769] update cryptolib and cosmos submods
Donnie-Ice Aug 11, 2025
85ab520
[nasa/nos3#769] update cosmos submod
Donnie-Ice Aug 11, 2025
3635465
[nasa/nos3#769] Update submods
Donnie-Ice Aug 13, 2025
8a4f686
[nasa/nos3#769] pushing WIP submods
Donnie-Ice Aug 19, 2025
9de3bad
[nasa/nos3#769] EP commands and tlm working
Donnie-Ice Aug 27, 2025
d22a08c
[nasa/nos3#769] EP command and tlm updates
Donnie-Ice Sep 4, 2025
de557ee
[nasa/nos3#769] remove cryptolib-cmd container from launch
Donnie-Ice Sep 9, 2025
09df53d
[nasa/nos3#769] update submods
Donnie-Ice Sep 9, 2025
4a2f9eb
[nasa/nos3#769] remove comment from launch script, update cryptolib s…
Donnie-Ice Sep 10, 2025
b63f44c
[nasa/nos3#769] update crypto submod
Donnie-Ice Sep 11, 2025
6fc732d
[nasa/nos3#769] update ci_launch script for headless mode
Donnie-Ice Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ all: ## Build everything: config, fsw, sim, gsw

build-cryptolib: ## Build CryptoLib Component, ## -DSTANDALONE_TCP=0 if using udp for cryptolib in the loop
mkdir -p $(GSWBUILDDIR)
cd $(GSWBUILDDIR) && cmake $(PREP_OPTS) -DSTANDALONE_TCP=1 -DSA_FILE=OFF -DSUPPORT=1 -DCRYPTO_LIBGCRYPT=1 -DSA_INTERNAL=1 -DMC_INTERNAL=1 -DKEY_INTERNAL=1 ../../components/cryptolib
cd $(GSWBUILDDIR) && cmake $(PREP_OPTS) -DSTANDALONE_TCP=1 -DSUPPORT=1 -DCRYPTO_LIBGCRYPT=1 -DSA_INTERNAL=1 -DMC_INTERNAL=1 -DKEY_INTERNAL=1 ../../components/cryptolib
$(MAKE) --no-print-directory -C $(GSWBUILDDIR)

build-fsw: ## Build the flight software (cFS or F')
Expand Down
2 changes: 1 addition & 1 deletion cfg/nos3_defs/cpu1_cfe_es_startup.scr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CFE_LIB, hwlib, hwlib_Init, HW_LIB,
CFE_LIB, io_lib, IO_LibInit, IO_LIB, 0, 0, 0x0, 0;

CFE_APP, sch, SCH_AppMain, SCH, 40, 16384, 0x0, 0;
CFE_APP, ci, CI_AppMain, CI, 41, 16384, 0x0, 0;
CFE_APP, ci, CI_AppMain, CI, 41, 32768, 0x0, 0;
CFE_APP, to, TO_AppMain, TO, 42, 32768, 0x0, 0;

CFE_APP, ci_lab, CI_Lab_AppMain, CI_LAB_APP, 80, 16384, 0x0, 0;
Expand Down
3 changes: 2 additions & 1 deletion cfg/nos3_defs/global_build_options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ set(CRYPTO_LIBGCRYPT ON CACHE BOOL "Cryptography Module - Libgcrypt" FORCE)
#set(DEBUG ON CACHE BOOL "CryptoLib Debug" FORCE)
set(KEY_INTERNAL ON CACHE BOOL "Key Module - Internal" FORCE)
set(MC_INTERNAL ON CACHE BOOL "Monitoring and Control - Internal" FORCE)
set(SA_FILE OFF CACHE BOOL "Save Security Association to File" FORCE)
#set(SA_FILE OFF CACHE BOOL "Save Security Association to File" FORCE)
set(SA_INTERNAL ON CACHE BOOL "Security Association - Internal" FORCE)
set(CRYPTO_EPROC ON CACHE BOOL "Extended Procedures" FORCE)
30 changes: 20 additions & 10 deletions cfg/nos3_defs/tables/to_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,16 @@ extern "C" {
*/
#define CF_CONFIG_TLM_MID 0x08B2
#define CF_PDU_TLM_MID 0x0FFD
#define CRYPTO_EP_TLM_MID 0x0980
#define CRYPTO_KEY_INV_TLM_MID 0x0981
#define CRYPTO_KEY_VRFY_TLM_MID 0x0982
#define CRYPTO_MC_PING_TLM_MID 0x0983
#define CRYPTO_MC_STATUS_TLM_MID 0x0984
#define CRYPTO_MC_DUMP_TLM_MID 0x0985
#define CRYPTO_MC_ERASE_TLM_MID 0x0986
#define CRYPTO_MC_SELFTEST_TLM_MID 0x0987
#define CRYPTO_SA_READARSN_TLM_MID 0x0988
#define CRYPTO_SA_STATUS_TLM_MID 0x0989

static CFE_TBL_FileDef_t CFE_TBL_FileDef =
{
Expand Down Expand Up @@ -163,16 +173,16 @@ TO_ConfigTable_t to_ConfigTable =
//{CFE_SB_MSGID_WRAP_VALUE(GENERIC_ADCS_DO_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},

/* 50 - 59 */
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
{CFE_SB_MSGID_WRAP_VALUE(CRYPTO_EP_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(CRYPTO_KEY_INV_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(CRYPTO_KEY_VRFY_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_PING_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_STATUS_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_DUMP_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_ERASE_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(CRYPTO_MC_SELFTEST_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(CRYPTO_SA_READARSN_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},
{CFE_SB_MSGID_WRAP_VALUE(CRYPTO_SA_STATUS_TLM_MID), {0,0}, 32, 0xffff, TO_GROUP_APP | TO_MGROUP_ONE, 0,1},

/* 60 - 69 */
{CFE_SB_MSGID_WRAP_VALUE(TO_UNUSED_ENTRY), {0,0}, 0, 0x0000, TO_GROUP_NONE, 0,0},
Expand Down
2 changes: 1 addition & 1 deletion components/cryptolib
Open in desktop
Submodule cryptolib updated 22 files
+1 −1 include/crypto.h
+14 −1 include/crypto_config.h
+8 −8 include/crypto_events.h
+1 −1 include/crypto_structs.h
+17 −3 src/core/crypto.c
+10 −0 src/core/crypto_aos.c
+29 −0 src/core/crypto_config.c
+24 −13 src/core/crypto_key_mgmt.c
+43 −16 src/core/crypto_mc.c
+70 −8 src/core/crypto_print.c
+18 −2 src/core/crypto_tc.c
+9 −1 src/core/crypto_tm.c
+7 −1 src/core/crypto_user.c
+36 −0 src/crypto/kmc/cryptography_interface_kmc_crypto_service.template.c
+68 −0 src/crypto/libgcrypt/cryptography_interface_libgcrypt.template.c
+2 −0 src/crypto/wolfssl/cryptography_interface_wolfssl.template.c
+2 −0 src/mc/internal/mc_interface_internal.template.c
+65 −35 src/sa/internal/sa_interface_inmemory.template.c
+3 −0 support/CMakeLists.txt
+279 −43 support/standalone/standalone.c
+3 −17 support/standalone/standalone.h
+54 −0 test/unit/ut_ep_sa_mgmt.c
2 changes: 1 addition & 1 deletion fsw/apps/ci
Open in desktop
Submodule ci updated 2 files
+28 −2 fsw/examples/udp_tf/ci_custom.c
+1 −1 fsw/examples/udp_tf/ci_platform_cfg.h
2 changes: 1 addition & 1 deletion fsw/apps/to
Open in desktop
Submodule to updated 5 files
+7 −0 fsw/examples/udp_tf/MISSION_to_types.h
+86 −25 fsw/examples/udp_tf/to_custom.c
+1 −1 fsw/examples/udp_tf/to_platform_cfg.h
+5 −1 fsw/src/to_app.c
+2 −1 fsw/src/to_msgdefs.h
2 changes: 1 addition & 1 deletion gsw/cosmos
Open in desktop
Submodule cosmos updated 10 files
+1 −0 config/system/stash/system.txt
+214 −0 config/targets/CFS/cmd_tlm/CRYPTO.txt
+109 −0 config/targets/CFS/cmd_tlm/CRYPTO_tlm.txt
+11 −0 config/targets/CFS/cmd_tlm/TO.txt
+2 −0 config/targets/CFS/target.txt
+20 −0 config/targets/CRYPTO/cmd_tlm/CRYPTO.txt
+35 −0 config/targets/CRYPTO/cmd_tlm/CRYPTO_TLM.txt
+11 −0 config/targets/CRYPTO/target.txt
+40 −0 config/targets/MISSION/procedures/mission_test.rb
+4 −0 config/tools/cmd_tlm_server/stash/cmd_tlm_server.txt
2 changes: 1 addition & 1 deletion gsw/yamcs
Open in desktop
Submodule yamcs updated 0 files
18 changes: 9 additions & 9 deletions scripts/ci_launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,18 +161,12 @@ for (( i=1; i<=$SATNUM; i++ )); do
-v /tmp/.X11-unix:/tmp/.X11-unix:ro -w "$USER_NOS3_DIR/42" $DBOX $USER_NOS3_DIR/42/42 NOS3InOut

echo "$SC_NUM - Flight Software..."
$DCALL run -dit --name ${SC_NUM}_nos_fsw -h nos-fsw --network=$SC_NET \
$DCALL run -dit --name ${SC_NUM}-nos-fsw -h nos-fsw --network=$SC_NET \
-v "$BASE_DIR:$BASE_DIR" -v "$FSW_DIR:$FSW_DIR" -v "$SCRIPT_DIR:$SCRIPT_DIR" \
-e USER=$(whoami) -e LD_LIBRARY_PATH=$FSW_DIR:/usr/lib:/usr/local/lib \
-w $FSW_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice \
$DBOX bash -c "exec ./core-cpu1 -R PO"

echo "$SC_NUM - CryptoLib..."
$DCALL run -d --name ${SC_NUM}-cryptolib --network=$SC_NET \
--log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \
--network-alias=cryptolib \
-v "$BASE_DIR:$BASE_DIR" -w "$BASE_DIR/gsw/build" $DBOX ./support/standalone

echo "$SC_NUM - Simulators..."
echo "$SC_NUM - NOS Engine Server..."
$DCALL run -dit --name ${SC_NUM}-nos-engine-server -h nos-engine-server --network=$SC_NET \
Expand All @@ -185,20 +179,26 @@ for (( i=1; i<=$SATNUM; i++ )); do
-v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \
./nos3-single-simulator $CFG_FILE truth42sim

echo "$SC_NUM - CryptoLib..."
$DCALL run -d --name ${SC_NUM}-cryptolib-gsw -h cryptolib --network=$SC_NET \
--log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \
--network-alias=cryptolib \
-v "$BASE_DIR:$BASE_DIR" -w "$BASE_DIR/gsw/build" $DBOX ./support/standalone

for sim in \
camsim generic-css-sim generic-eps-sim generic-fss-sim \
gps generic-imu-sim generic-mag-sim \
generic-reactionwheel-sim0 generic-reactionwheel-sim1 \
generic-reactionwheel-sim2 generic-radio-sim sample-sim \
generic-star-tracker-sim generic-thruster-sim generic-torquer-sim; do

if [[ "$sim" == "generic_radio_sim" ]]; then
if [[ "$sim" == "generic-radio-sim" ]]; then
$DCALL run -d --name ${SC_NUM}-${sim} --network=$SC_NET \
-h radio-sim --network-alias=radio-sim \
-v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \
./nos3-single-simulator $CFG_FILE $sim
else
$DCALL run -d --name ${SC_NUM}_${sim} --network=$SC_NET \
$DCALL run -d --name ${SC_NUM}-${sim} --network=$SC_NET \
-v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \
./nos3-single-simulator $CFG_FILE $sim
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/fsw/fsw_cfs_launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ do
echo ""

echo $SC_NUM " - CryptoLib..."
gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_gsw" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone
gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-cryptolib-gsw" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone
echo ""
done

Expand Down