Skip to content

Commit d4e242b

Browse files
Donnie-IceDonnie-Ice
committed
[#344] Ran formatter
1 parent 2af12f1 commit d4e242b

File tree

5 files changed

+43
-39
lines changed

5 files changed

+43
-39
lines changed

‎src/core/crypto.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,8 @@ int32_t Crypto_Get_Security_Trailer_Length(SecurityAssociation_t *sa_ptr)
11731173

11741174
void Crypto_Set_FSR(uint8_t *p_ingest, uint16_t byte_idx, uint16_t pdu_len, SecurityAssociation_t *sa_ptr)
11751175
{
1176-
if (current_managed_parameters_struct.has_ocf == TM_HAS_OCF || current_managed_parameters_struct.has_ocf == AOS_HAS_OCF)
1176+
if (current_managed_parameters_struct.has_ocf == TM_HAS_OCF ||
1177+
current_managed_parameters_struct.has_ocf == AOS_HAS_OCF)
11771178
{
11781179
Telemetry_Frame_Ocf_Fsr_t temp_report;
11791180
byte_idx += (pdu_len + sa_ptr->stmacf_len);

‎src/core/crypto_key_mgmt.c

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ int32_t Crypto_Key_OTAR(void)
4545
int y;
4646
int32_t status = CRYPTO_LIB_SUCCESS;
4747
// uint16_t pdu_len = (uint16_t) sdls_frame.pdu.hdr.pdu_len[1] << 8 | sdls_frame.pdu.hdr.pdu_len[0];
48-
int pdu_keys = (sdls_frame.pdu.hdr.pdu_len - SDLS_KEYID_LEN - SDLS_IV_LEN - MAC_SIZE) / (SDLS_KEYID_LEN + SDLS_KEY_LEN);
48+
int pdu_keys =
49+
(sdls_frame.pdu.hdr.pdu_len - SDLS_KEYID_LEN - SDLS_IV_LEN - MAC_SIZE) / (SDLS_KEYID_LEN + SDLS_KEY_LEN);
4950
int w;
5051
crypto_key_t *ekp = NULL;
5152

@@ -100,25 +101,26 @@ int32_t Crypto_Key_OTAR(void)
100101
}
101102

102103
uint8_t ecs = CRYPTO_CIPHER_AES256_GCM;
103-
status = cryptography_if->cryptography_aead_decrypt(&(sdls_frame.pdu.data[14]), // plaintext output
104-
(size_t)(pdu_keys * (SDLS_KEYID_LEN + SDLS_KEY_LEN)), // length of data
105-
NULL, // in place decryption
106-
0, // in data length
107-
&(ekp->value[0]), // key
108-
ekp->key_len, // key length
109-
NULL, // SA reference
110-
&(packet.iv[0]), // IV
111-
SDLS_IV_LEN, // IV length
112-
&(packet.mac[0]), // tag input
113-
MAC_SIZE, // tag size
114-
NULL, // AAD
115-
0, // AAD Length
116-
CRYPTO_TRUE, // decrypt
117-
CRYPTO_TRUE, // authenticate
118-
CRYPTO_FALSE, // AAD Bool
119-
&ecs, // encryption cipher
120-
NULL, // authentication cipher
121-
NULL // cam_cookies
104+
status = cryptography_if->cryptography_aead_decrypt(
105+
&(sdls_frame.pdu.data[14]), // plaintext output
106+
(size_t)(pdu_keys * (SDLS_KEYID_LEN + SDLS_KEY_LEN)), // length of data
107+
NULL, // in place decryption
108+
0, // in data length
109+
&(ekp->value[0]), // key
110+
ekp->key_len, // key length
111+
NULL, // SA reference
112+
&(packet.iv[0]), // IV
113+
SDLS_IV_LEN, // IV length
114+
&(packet.mac[0]), // tag input
115+
MAC_SIZE, // tag size
116+
NULL, // AAD
117+
0, // AAD Length
118+
CRYPTO_TRUE, // decrypt
119+
CRYPTO_TRUE, // authenticate
120+
CRYPTO_FALSE, // AAD Bool
121+
&ecs, // encryption cipher
122+
NULL, // authentication cipher
123+
NULL // cam_cookies
122124
);
123125

124126
// Read in Decrypted Data

‎src/sa/mariadb/sa_interface_mariadb.template.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ static int32_t sa_get_operational_sa_from_gvcid(uint8_t tfvn, uint16_t scid, uin
199199
int32_t status = CRYPTO_LIB_SUCCESS;
200200

201201
char gvcid_query[2048];
202-
snprintf(gvcid_query, sizeof(gvcid_query), SQL_SADB_GET_SA_BY_GVCID, SADB_TABLE, tfvn, scid, vcid, mapid, SA_OPERATIONAL);
202+
snprintf(gvcid_query, sizeof(gvcid_query), SQL_SADB_GET_SA_BY_GVCID, SADB_TABLE, tfvn, scid, vcid, mapid,
203+
SA_OPERATIONAL);
203204

204205
status = parse_sa_from_mysql_query(&gvcid_query[0], security_association);
205206

@@ -226,15 +227,15 @@ static int32_t sa_save_sa(SecurityAssociation_t *sa)
226227

227228
if (sa->iv != NULL)
228229
{
229-
snprintf(update_sa_query, sizeof(update_sa_query), SQL_SADB_UPDATE_IV_ARC_BY_SPI, SADB_TABLE, iv_h, arsn_h, sa->spi,
230-
sa->gvcid_blk.tfvn, sa->gvcid_blk.scid, sa->gvcid_blk.vcid, sa->gvcid_blk.mapid);
230+
snprintf(update_sa_query, sizeof(update_sa_query), SQL_SADB_UPDATE_IV_ARC_BY_SPI, SADB_TABLE, iv_h, arsn_h,
231+
sa->spi, sa->gvcid_blk.tfvn, sa->gvcid_blk.scid, sa->gvcid_blk.vcid, sa->gvcid_blk.mapid);
231232

232233
free(iv_h);
233234
}
234235
else
235236
{
236-
snprintf(update_sa_query, sizeof(update_sa_query), SQL_SADB_UPDATE_IV_ARC_BY_SPI_NULL_IV, SADB_TABLE, arsn_h, sa->spi,
237-
sa->gvcid_blk.tfvn, sa->gvcid_blk.scid, sa->gvcid_blk.vcid, sa->gvcid_blk.mapid);
237+
snprintf(update_sa_query, sizeof(update_sa_query), SQL_SADB_UPDATE_IV_ARC_BY_SPI_NULL_IV, SADB_TABLE, arsn_h,
238+
sa->spi, sa->gvcid_blk.tfvn, sa->gvcid_blk.scid, sa->gvcid_blk.vcid, sa->gvcid_blk.mapid);
238239
free(iv_h);
239240
}
240241

‎test/unit/ut_aos_process.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,7 +1808,7 @@ UTEST(AOS_PROCESS, AOS_SA_NOT_OPERATIONAL)
18081808
UTEST(AOS_PROCESS, AOS_OCF_TEST)
18091809
{
18101810
remove("sa_save_file.bin");
1811-
1811+
18121812
// Local Variables
18131813
int32_t status = CRYPTO_LIB_SUCCESS;
18141814
uint8_t *ptr_processed_frame = NULL;
@@ -1834,10 +1834,10 @@ UTEST(AOS_PROCESS, AOS_OCF_TEST)
18341834
SecurityAssociation_t *sa_ptr = NULL;
18351835
SaInterface sa_if = get_sa_interface_inmemory();
18361836
sa_if->sa_get_from_spi(9, &sa_ptr); // Enable and setup 5
1837-
sa_ptr->sa_state = SA_OPERATIONAL;
1838-
sa_ptr->shivf_len = 0;
1839-
sa_ptr->gvcid_blk.tfvn = 1;
1840-
sa_ptr->gvcid_blk.vcid = 0;
1837+
sa_ptr->sa_state = SA_OPERATIONAL;
1838+
sa_ptr->shivf_len = 0;
1839+
sa_ptr->gvcid_blk.tfvn = 1;
1840+
sa_ptr->gvcid_blk.vcid = 0;
18411841
sa_ptr->gvcid_blk.mapid = 0;
18421842

18431843
status =

‎test/unit/ut_crypto.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ UTEST(CRYPTO_C, PDU_SWITCH)
113113
Crypto_Init();
114114

115115
sdls_frame.pdu.hdr.type = PDU_TYPE_COMMAND;
116-
sdls_frame.pdu.hdr.uf = PDU_USER_FLAG_FALSE;
116+
sdls_frame.pdu.hdr.uf = PDU_USER_FLAG_FALSE;
117117
printf("SG_KEY_MGMT\n");
118118
sdls_frame.pdu.hdr.sg = SG_KEY_MGMT;
119119
sdls_frame.pdu.hdr.pid = PID_OTAR;
@@ -131,8 +131,8 @@ UTEST(CRYPTO_C, PDU_SWITCH)
131131
status = Crypto_PDU(ingest, &tc_frame);
132132
ASSERT_EQ(status, CRYPTO_LIB_SUCCESS);
133133

134-
sdls_frame.pdu.hdr.pid = PID_KEY_VERIFICATION;
135-
status = Crypto_PDU(ingest, &tc_frame);
134+
sdls_frame.pdu.hdr.pid = PID_KEY_VERIFICATION;
135+
status = Crypto_PDU(ingest, &tc_frame);
136136
ASSERT_EQ(status, CRYPTO_LIB_SUCCESS);
137137

138138
sdls_frame.pdu.hdr.pid = PID_KEY_DESTRUCTION;
@@ -250,7 +250,7 @@ UTEST(CRYPTO_C, PDU_SWITCH)
250250
ASSERT_EQ(status, CRYPTO_LIB_SUCCESS);
251251

252252
sdls_frame.pdu.hdr.pid = PID_MODIFY_VCID;
253-
status = Crypto_PDU(ingest, &tc_frame);
253+
status = Crypto_PDU(ingest, &tc_frame);
254254
ASSERT_EQ(status, CRYPTO_LIB_ERROR);
255255

256256
sdls_frame.pdu.hdr.pid = 8;
@@ -359,21 +359,21 @@ UTEST(CRYPTO_C, STRUCT_SIZE_VERIFICATION)
359359
ASSERT_EQ(SDLS_TLV_HDR_SIZE, (size_t)3);
360360
ASSERT_EQ(SDLS_TLV_SIZE, (size_t)497);
361361
ASSERT_EQ(SDLS_EKB_SIZE, (size_t)514);
362-
ASSERT_EQ(SDLS_OTAR_SIZE, (size_t)(2 + 16 + 30*514 + 16));
362+
ASSERT_EQ(SDLS_OTAR_SIZE, (size_t)(2 + 16 + 30 * 514 + 16));
363363
ASSERT_EQ(SDLS_KEY_SIZE, (size_t)2);
364364
ASSERT_EQ(SDLS_KEY_INVENTORY_CMD_SIZE, (size_t)4);
365365
ASSERT_EQ(SDLS_KEY_INVENTORY_RPLY_SIZE, (size_t)3);
366366
ASSERT_EQ(SDLS_KEYV_CMD_BLK_SIZE, (size_t)18);
367-
ASSERT_EQ(SDLS_KEYV_CMD_SIZE, (size_t)(29*18));
367+
ASSERT_EQ(SDLS_KEYV_CMD_SIZE, (size_t)(29 * 18));
368368
ASSERT_EQ(SDLS_KEYV_RPLY_BLK_SIZE, (size_t)50);
369-
ASSERT_EQ(SDLS_KEYV_RPLY_SIZE, (size_t)(50*29));
369+
ASSERT_EQ(SDLS_KEYV_RPLY_SIZE, (size_t)(50 * 29));
370370
ASSERT_EQ(SDLS_KEYDB_CMD_SIZE, (size_t)12);
371371
ASSERT_EQ(SDLS_KEYDB_RPLY_SIZE, (size_t)38);
372372
ASSERT_EQ(SDLS_SA_STATUS_RPLY_SIZE, (size_t)3);
373373
ASSERT_EQ(SDLS_SA_READ_ARSN_RPLY_SIZE, (size_t)22);
374374
ASSERT_EQ(SDLS_MC_LOG_RPLY_SIZE, (size_t)4);
375375
ASSERT_EQ(SDLS_MC_DUMP_RPLY_SIZE, (size_t)7);
376-
ASSERT_EQ(SDLS_MC_DUMP_BLK_RPLY_SIZE, (size_t)(7*50));
376+
ASSERT_EQ(SDLS_MC_DUMP_BLK_RPLY_SIZE, (size_t)(7 * 50));
377377
ASSERT_EQ(SDLS_MC_ST_RPLY_SIZE, (size_t)1);
378378
ASSERT_EQ(SDLS_MC_SN_RPLY_SIZE, (size_t)16);
379379
ASSERT_EQ(TC_FRAME_PRIMARYHEADER_STRUCT_SIZE, (size_t)5);

0 commit comments

Comments
 (0)