Skip to content

Commit

Permalink
[#241] Remove remaining tracking comments
Browse files Browse the repository at this point in the history
  • Loading branch information
rjbrown2 committed May 29, 2024
1 parent 8d2f6d1 commit a3789d3
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
7 changes: 0 additions & 7 deletions src/sa/internal/sa_interface_inmemory.template.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,7 @@ void update_sa_from_ptr(SecurityAssociation_t* sa_ptr)
sa[location].ekid = sa_ptr->ekid;
sa[location].akid = sa_ptr->akid;
memcpy(sa[location].ek_ref, sa_ptr->ek_ref, REF_SIZE);
//sa[location].ek_ref = sa_ptr->ek_ref;
memcpy(sa[location].ak_ref, sa_ptr->ak_ref, REF_SIZE);
//sa[location].ak_ref = sa_ptr->ak_ref;
sa[location].sa_state = sa_ptr->sa_state;
sa[location].gvcid_blk = sa_ptr->gvcid_blk;
sa[location].lpid = sa_ptr->lpid;
Expand All @@ -142,7 +140,6 @@ void update_sa_from_ptr(SecurityAssociation_t* sa_ptr)
{
sa[location].iv[i] = sa_ptr->iv[i];
}
//sa[location].iv[0] = sa_ptr->iv;
sa[location].iv_len = sa_ptr->iv_len;
sa[location].acs_len = sa_ptr->acs_len;
sa[location].acs = sa_ptr->acs;
Expand All @@ -151,13 +148,11 @@ void update_sa_from_ptr(SecurityAssociation_t* sa_ptr)
{
sa[location].abm[i] = sa_ptr->abm[i];
}
//sa[location].abm[0] = sa_ptr->abm;
sa[location].arsn_len = sa_ptr->arsn_len;
for(int i = 0; i<sa_ptr->arsn_len; i++)
{
sa[location].arsn[i] = sa_ptr->arsn[i];
}
//sa[location].arsn[0] = sa_ptr->arsn;
sa[location].arsnw_len = sa_ptr->arsnw_len;
sa[location].arsnw = sa_ptr->arsnw;
}
Expand Down Expand Up @@ -416,7 +411,6 @@ void sa_populate(void)
sa[10].gvcid_blk.mapid = TYPE_TC;
char ek_ref_string[20] = "kmc/test/key130";
memcpy(sa[10].ek_ref, ek_ref_string, strlen(ek_ref_string));
//sa[10].ek_ref = (char*) "kmc/test/key130";

// SA 11 - KEYED; ARSNW:5; AES-GCM; IV:00...00; IV-len:12; MAC-len:16; Key-ID: 130
// SA 11 VC0/1 is now 4-VC0, 7-VC1
Expand All @@ -440,7 +434,6 @@ void sa_populate(void)
sa[11].gvcid_blk.scid = SCID & 0x3FF;
sa[11].gvcid_blk.vcid = 0;
sa[11].gvcid_blk.mapid = TYPE_TC;
//sa[11].ek_ref = (char*) "kmc/test/key130";
memcpy(sa[11].ek_ref, ek_ref_string, strlen(ek_ref_string));

// SA 12 - TM CLEAR MODE
Expand Down
2 changes: 0 additions & 2 deletions src/sa/mariadb/sa_interface_mariadb.template.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,8 @@ static int32_t sa_save_sa(SecurityAssociation_t* sa)
// We free the allocated SA memory in the save function.
if (sa->ek_ref[0] != '\0')
clean_ekref(sa);
//free(sa->ek_ref);
if (sa->ak_ref[0] != '\0')
clean_akref(sa);
//free(sa->ak_ref);
free(sa);

return status;
Expand Down

0 comments on commit a3789d3

Please sign in to comment.