Skip to content

[nasa/nos3#755] fix aos bugs, allow standalone to parse aos #484

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

Open
wants to merge 10 commits into
base: dev
Choose a base branch
from
Open

[nasa/nos3#755] fix aos bugs, allow standalone to parse aos #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
758b795
[nasa/nos3#755] fix aos bugs, allow standalone to parse aos
Donnie-Ice Jul 24, 2025
d199855
style: auto-format via clang-format
Donnie-Ice Jul 25, 2025
bff05b1
pull updated aos_process UTs
Donnie-Ice Jul 25, 2025
94868f7
style: auto-format via clang-format
Donnie-Ice Jul 25, 2025
45e662e
update managed parameter structs
Donnie-Ice Jul 25, 2025
e4789f6
Merge branch 'nos3#755' of https://github.com/nasa/CryptoLib into nos…
Donnie-Ice Jul 25, 2025
1621f4d
update managed parameter structs (2)
Donnie-Ice Jul 25, 2025
039bf28
Updates to AOS_Process UTs with new header parsing
Donnie-Ice Jul 28, 2025
87d82cd
style: auto-format via clang-format
Donnie-Ice Jul 28, 2025
0cd0c28
Merge branch 'dev' into nos3#755
Donnie-Ice Aug 20, 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
6 changes: 3 additions & 3 deletions src/core/crypto_aos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,8 +829,8 @@ int32_t Crypto_AOS_ProcessSecurity(uint8_t *p_ingest, uint16_t len_ingest, uint8

// Bit math to give concise access to values in the ingest
aos_frame_pri_hdr.tfvn = ((uint8_t)p_ingest[0] & 0xC0) >> 6;
aos_frame_pri_hdr.scid = (((uint16_t)p_ingest[0] & 0x3F) << 4) | (((uint16_t)p_ingest[1] & 0xF0) >> 4);
aos_frame_pri_hdr.vcid = ((uint8_t)p_ingest[1] & 0x0E) >> 1;
aos_frame_pri_hdr.scid = (((uint16_t)p_ingest[0] & 0x3F) << 2) | (((uint16_t)p_ingest[1] & 0xC0) >> 6);
aos_frame_pri_hdr.vcid = ((uint8_t)p_ingest[1] & 0x3F);

#ifdef DEBUG
printf(KYEL "\n----- Crypto_AOS_ProcessSecurity START -----\n" RESET);
Expand Down Expand Up @@ -1117,7 +1117,7 @@ int32_t Crypto_AOS_ProcessSecurity(uint8_t *p_ingest, uint16_t len_ingest, uint8
}
// Increment byte_idx past Security Header Fields based on SA values
byte_idx += sa_ptr->shivf_len;
byte_idx += (sa_ptr->arsn_len - sa_ptr->shsnf_len);
byte_idx += sa_ptr->shsnf_len;
byte_idx += sa_ptr->shplf_len;

#ifdef SA_DEBUG
Expand Down
11 changes: 11 additions & 0 deletions src/core/crypto_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ int32_t Crypto_SC_Init(void)
Crypto_Config_Add_Gvcid_Managed_Parameters(TM_UT_Managed_Parameters);
TM_UT_Managed_Parameters.vcid = 5;
Crypto_Config_Add_Gvcid_Managed_Parameters(TM_UT_Managed_Parameters);

// AOS
GvcidManagedParameters_t AOS_UT_Managed_Parameters = {
1, 0x0003, 6, AOS_NO_FECF, AOS_FHEC_NA, AOS_IZ_NA, 0, AOS_SEGMENT_HDRS_NA, 1786, AOS_NO_OCF, 1};
Crypto_Config_Add_Gvcid_Managed_Parameters(AOS_UT_Managed_Parameters);
status = Crypto_Init();

SecurityAssociation_t *sa_ptr = NULL;
Expand Down Expand Up @@ -132,6 +137,12 @@ int32_t Crypto_SC_Init(void)
sa_ptr->gvcid_blk.vcid = 5;
sa_ptr->shivf_len = 0;
sa_ptr->iv_len = 0;
sa_if->sa_get_from_spi(10, &sa_ptr);
sa_ptr->acs = CRYPTO_MAC_HMAC_SHA256;
sa_ptr->shsnf_len = 2;
sa_ptr->ekid = 128;
sa_ptr->akid = 128;
sa_ptr->gvcid_blk.vcid = 6;

return status;
}
Expand Down
52 changes: 26 additions & 26 deletions src/crypto/libgcrypt/cryptography_interface_libgcrypt.template.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,31 +305,31 @@ static int32_t cryptography_validate_authentication(uint8_t *data_out, size_t le

#ifdef MAC_DEBUG
// Commented out due to memory leaks with HMAC
// uint32_t *tmac_size = &mac_size;
// uint8_t tmac[*tmac_size];
// gcry_error = gcry_mac_read(tmp_mac_hd,
// &tmac, // tag output
// (size_t*)&mac_size // tag size
// );
// if ((gcry_error & GPG_ERR_CODE_MASK) != GPG_ERR_NO_ERROR)
// {
// printf(KRED "ERROR: gcry_mac_read error code %d\n" RESET, gcry_error & GPG_ERR_CODE_MASK);
// status = CRYPTO_LIB_ERR_MAC_RETRIEVAL_ERROR;
// return status;
// }

// printf("Calculated Mac Size: %d\n", *tmac_size);
// printf("Calculated MAC (full length):\n\t");
// for (uint32_t i = 0; i < *tmac_size; i++)
// {
// printf("%02X", tmac[i]);
// }
// printf("\nCalculated MAC (truncated to sa_ptr->stmacf_len):\n\t");
// for (uint32_t i = 0; i < mac_size; i++)
// {
// printf("%02X", tmac[i]);
// }
// printf("\n");
uint32_t *tmac_size = &mac_size;
uint8_t tmac[*tmac_size];
gcry_error = gcry_mac_read(tmp_mac_hd,
&tmac, // tag output
(size_t *)&mac_size // tag size
);
if ((gcry_error & GPG_ERR_CODE_MASK) != GPG_ERR_NO_ERROR)
{
printf(KRED "ERROR: gcry_mac_read error code %d\n" RESET, gcry_error & GPG_ERR_CODE_MASK);
status = CRYPTO_LIB_ERR_MAC_RETRIEVAL_ERROR;
return status;
}

printf("Calculated Mac Size: %d\n", *tmac_size);
printf("Calculated MAC (full length):\n\t");
for (uint32_t i = 0; i < *tmac_size; i++)
{
printf("%02X", tmac[i]);
}
printf("\nCalculated MAC (truncated to sa_ptr->stmacf_len):\n\t");
for (uint32_t i = 0; i < mac_size; i++)
{
printf("%02X", tmac[i]);
}
printf("\n");

printf("Received MAC:\n\t");
for (uint32_t i = 0; i < mac_size; i++)
Expand Down Expand Up @@ -666,7 +666,7 @@ static int32_t cryptography_aead_encrypt(
);
if ((gcry_error & GPG_ERR_CODE_MASK) != GPG_ERR_NO_ERROR)
{
printf(KRED "ERROR: gcry_cipher_checktag error code %d\n" RESET, gcry_error & GPG_ERR_CODE_MASK);
printf(KRED "ERROR: gcry_cipher_gettag error code %d\n" RESET, gcry_error & GPG_ERR_CODE_MASK);
printf(KRED "Failure: %s/%s\n", gcry_strsource(gcry_error), gcry_strerror(gcry_error));
status = CRYPTO_LIB_ERR_MAC_RETRIEVAL_ERROR;
gcry_cipher_close(tmp_hd);
Expand Down
20 changes: 16 additions & 4 deletions support/standalone/standalone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,11 +788,23 @@ void *crypto_standalone_tm_process(void *socks)
// Process Security skipping prepended ASM
crypto_standalone_tm_debug_process(tm_process_in);
// Account for ASM length
status =
Crypto_TM_ProcessSecurity(tm_process_in + 4, (const uint16_t)tm_process_len - 4, &tm_ptr, &tm_out_len);
if (status != 0)
if (tm_process_in[4] == 0x40)
{
printf("Crypto_TM_ProcessSecurity Failed with status = %d\n", status);
status = Crypto_AOS_ProcessSecurity(tm_process_in + 4, (const uint16_t)tm_process_len - 4, &tm_ptr,
&tm_out_len);
if (status != 0)
{
printf("Crypto_AOS_ProcessSecurity Failed with status = %d\n", status);
}
}
else
{
status = Crypto_TM_ProcessSecurity(tm_process_in + 4, (const uint16_t)tm_process_len - 4, &tm_ptr,
&tm_out_len);
if (status != 0)
{
printf("Crypto_TM_ProcessSecurity Failed with status = %d\n", status);
}
}
#else
if (tm_debug == 1)
Expand Down
13 changes: 6 additions & 7 deletions test/unit/ut_aos_apply.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ UTEST(AOS_APPLY, HAPPY_PATH_CLEAR_FECF)

// Truth frame setup
char *truth_aos_h =
"40C000000000000A112233445566778899AABBCCDDEEFFA107FF000006D2ABBABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABB"
"40C0000000000009000000000000000000000000DDEEFFA107FF000006D2ABBABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABB"
"AABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAA"
"BBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABB"
"AABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAA"
Expand Down Expand Up @@ -242,7 +242,7 @@ UTEST(AOS_APPLY, HAPPY_PATH_CLEAR_FECF)
"AABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAA"
"BBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABB"
"AABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAA"
"BBAABBAABBAABBAA778A1E133306963F1D9DCA32D6D60C23966A";
"BBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAABBAAC3D3";
char *truth_aos_b = NULL;
int truth_aos_len = 0;
hex_conversion(truth_aos_h, &truth_aos_b, &truth_aos_len);
Expand All @@ -254,6 +254,9 @@ UTEST(AOS_APPLY, HAPPY_PATH_CLEAR_FECF)

SecurityAssociation_t *test_association;
sa_if->sa_get_from_spi(10, &test_association);
test_association->sa_state = SA_KEYED;
sa_if->sa_get_from_spi(9, &test_association);
test_association->sa_state = SA_OPERATIONAL;

crypto_key_t *ekp = NULL;
ekp = key_if->get_key(test_association->ekid);
Expand Down Expand Up @@ -1342,15 +1345,11 @@ UTEST(AOS_APPLY, AEAD_GCM_BITMASK_1)
aos_frame_pri_hdr.scid = (((uint16_t)test_aos_b[0] & 0x3F) << 2) | (((uint16_t)test_aos_b[1] & 0xC0) >> 6);
aos_frame_pri_hdr.vcid = ((uint8_t)test_aos_b[1] & 0x3F);

// Expose/setup SA for testing
// Configure SA 14 off
sa_if->sa_get_from_spi(10, &sa_ptr);
sa_ptr->sa_state = SA_KEYED;

// Configure SA 17 on
sa_if->sa_get_from_spi(10, &sa_ptr);
sa_ptr->sa_state = SA_OPERATIONAL;
sa_ptr->ekid = 130;
sa_ptr->akid = 130;
sa_ptr->ecs = CRYPTO_CIPHER_AES256_GCM;
sa_ptr->est = 1;
sa_ptr->ast = 1;
Expand Down
Loading