Skip to content
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

Jump to bottom

CryptoLib#160 - Standalone VCID Checks #162

Merged
merged 3 commits into from
May 12, 2023
Merged

CryptoLib#160 - Standalone VCID Checks #162

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d96442
[nasa/cryptolib#160] Add in protections when changing VCID to CryptoL…
jlucas9 May 11, 2023
48f12d2
Merge remote-tracking branch 'origin/dev' into cryptolib#160-Standalo…
jlucas9 May 12, 2023
df676aa
[nasa/cryptolib#160] Removed change to printf due to build issue with…
jlucas9 May 12, 2023
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
33 changes: 31 additions & 2 deletions util/src_util/standalone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,37 @@ int32_t crypto_standalone_process_command(int32_t cc, int32_t num_tokens, char*
case CRYPTO_CMD_VCID:
if (crypto_standalone_check_number_arguments(num_tokens, 1) == CRYPTO_LIB_SUCCESS)
{
tc_vcid = (uint8_t) atoi(&tokens[0]);
printf("Changed active virtual channel (VCID) to %d \n", tc_vcid);
uint8_t vcid = (uint8_t) atoi(&tokens[0]);
/* Confirm new VCID valid */
if (vcid < 64)
{
SadbRoutine sadb_routine = get_sadb_routine_inmemory();
SecurityAssociation_t* test_association = NULL;
sadb_routine->sadb_get_sa_from_spi(vcid, &test_association);

/* Handle special case for VCID */
if(vcid == 1)
{
printf("Special case for VCID 1! \n");
vcid = 0;
}

if ((test_association->sa_state == SA_OPERATIONAL) &&
(test_association->gvcid_blk.mapid == TYPE_TC) &&
(test_association->gvcid_blk.scid == SCID))
{
tc_vcid = vcid;
printf("Changed active virtual channel (VCID) to %d \n", tc_vcid);
}
else
{
printf("Error - virtual channel (VCID) %d is invalid! Sticking with prior vcid %d \n", vcid, tc_vcid);
}
}
else
{
printf("Error - virtual channl (VCID) %d must be less than 64! Sticking with prior vcid %d \n", vcid, tc_vcid);
}
}
break;

Expand Down