Skip to content

Fixing couple of open issues (logic bugs) and a security issue #509

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
VissaMoutafis wants to merge 2 commits into
base: dev
Choose a base branch
from
+21 −4
Open

Fixing couple of open issues (logic bugs) and a security issue #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70fc634
[FIX] Fixing couple of issues and a security bug
VissaMoutafis Apr 8, 2026
e1ea925
Merge branch 'dev' of https://github.com/VissaMoutafis/CryptoLib into…
VissaMoutafis Apr 8, 2026
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: 2 additions & 0 deletions src/core/crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,6 +1225,8 @@ int32_t Crypto_Process_Extended_Procedure_Pdu(TC_t *tc_sdls_processed_frame, uin
sdls_frame.tlv_pdu.hdr.pid = (tc_sdls_processed_frame->tc_pdu[0] & 0x0F);
sdls_frame.tlv_pdu.hdr.pdu_len =
(tc_sdls_processed_frame->tc_pdu[1] << 8) | tc_sdls_processed_frame->tc_pdu[2];
sdls_frame.hdr.pkt_length =
(tc_sdls_processed_frame->tc_pdu[4] << 8) | tc_sdls_processed_frame->tc_pdu[5];
for (int x = 3; x < (3 + tc_sdls_processed_frame->tc_header.fl); x++)
{
// Todo - Consider how this behaves with large OTAR PDUs that are larger than 1 TC in size. Most
Expand Down
5 changes: 4 additions & 1 deletion src/core/crypto_key_mgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ int32_t Crypto_Key_OTAR(void)
count = count + 2;
#ifdef DEBUG
printf("\t Key %d = %d\n", x, packet.EKB[x].ekid);
#endif
#endif
ekp->key_len = 0;
for (y = count; y < (SDLS_KEY_LEN + count); y++)
{
// Encrypted Key
Expand All @@ -203,6 +204,8 @@ int32_t Crypto_Key_OTAR(void)
#endif
// Setup Key Ring
ekp->value[y - count] = sdls_frame.tlv_pdu.data[y];

ekp->key_len++;
}
count = count + SDLS_KEY_LEN;

Expand Down
18 changes: 15 additions & 3 deletions src/sa/internal/sa_interface_inmemory.template.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1297,8 +1297,11 @@ static int32_t sa_rekey(TC_t *tc_frame)
{ // Encryption Key
sa[spi].ekid =
((uint8_t)sdls_frame.tlv_pdu.data[count] << BYTE_LEN) | (uint8_t)sdls_frame.tlv_pdu.data[count + 1];
count = count + 2;
count = count + 2;
sa[spi].akid =
((uint8_t)sdls_frame.tlv_pdu.data[count] << BYTE_LEN) | (uint8_t)sdls_frame.tlv_pdu.data[count + 1];

count = count + 2;
// Anti-Replay Seq Num
#ifdef PDU_DEBUG
printf("SPI %d IV updated to: 0x", spi);
Expand Down Expand Up @@ -1453,6 +1456,15 @@ static int32_t sa_create(TC_t *tc_frame)
// 5-8 : Procedure Identification Field (pid)
temp_sa->lpid = (sdls_frame.tlv_pdu.hdr.type << 7) | (sdls_frame.tlv_pdu.hdr.uf << 6) |
(sdls_frame.tlv_pdu.hdr.sg << 4) | sdls_frame.tlv_pdu.hdr.pid;

// check that the sa state is NONE
if (temp_sa->sa_state != SA_NONE)
{
#ifdef DEBUG
printf(KRED "ERROR: SPI %d is not in the NONE state.\n" RESET, spi);
#endif
return CRYPTO_LIB_ERROR_SA;
}

// Write SA Configuration
temp_sa->est = ((uint8_t)sdls_frame.tlv_pdu.data[2] & 0x80) >> 7;
Expand All @@ -1466,8 +1478,8 @@ static int32_t sa_create(TC_t *tc_frame)
{
temp_sa->ecs = ((uint8_t)sdls_frame.tlv_pdu.data[count++]);
}
temp_sa->shivf_len = ((uint8_t)sdls_frame.tlv_pdu.data[count++]);
for (x = 0; x < temp_sa->shivf_len; x++)
temp_sa->iv_len = ((uint8_t)sdls_frame.tlv_pdu.data[count++]);
for (x = 0; x < temp_sa->iv_len; x++)
{
temp_sa->iv[x] = ((uint8_t)sdls_frame.tlv_pdu.data[count++]);
}
Expand Down