From: Mazet Laurent Date: Fri, 9 May 2025 08:34:37 +0000 (+0200) Subject: Merge branch 'master' into add_aad_and_tag_fields X-Git-Tag: v1.0~29 X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=3dcb0c0c8b18197ae8d1782c48ef924293852f7f;p=morep.git Merge branch 'master' into add_aad_and_tag_fields --- 3dcb0c0c8b18197ae8d1782c48ef924293852f7f diff --cc pdu_clear_data.c index 80669b9,fbfd820..bfcff50 --- a/pdu_clear_data.c +++ b/pdu_clear_data.c @@@ -24,8 -24,8 +24,9 @@@ int parse_clear_data (char *line, CLEAR PARSE_INT ("CHANNELID", out->channel_id) PARSE_INT ("BYPASSLEN", out->bypass_len) PARSE_ARRAY ("BYPASS", out->bypass, 1) + PARSE_TAB ("AAD", out->aad) PARSE_ARRAY ("DATA", out->data) + PARSE_INT ("DATALEN", out->data_len) /* for checking */ END_PARSE () } @@@ -68,8 -65,8 +69,9 @@@ int check_clear_data (CLEAR_DATA_t *fir CHECK_INT ("CHANNELID", first->channel_id, second->channel_id) CHECK_INT ("BYPASSLEN", first->bypass_len, second->bypass_len) CHECK_ARRAY ("BYPASS", first->bypass, second->bypass) + CHECK_TAB ("AAD", first->aad, second->aad) CHECK_ARRAY ("DATA", first->data, second->data) + CHECK_INT ("DATALEN", first->data_len, second->data_len) END_CHECK () } diff --cc pdu_encrypted_data.c index c89d263,b765232..12356a4 --- a/pdu_encrypted_data.c +++ b/pdu_encrypted_data.c @@@ -22,11 -22,11 +22,12 @@@ int parse_encrypted_data (char *line, E { BEGIN_PARSE (line) PARSE_INT ("CHANNELID", out->channel_id) - PARSE_TAB ("IV", out->iv) PARSE_INT ("BYPASSLEN", out->bypass_len) PARSE_ARRAY ("BYPASS", out->bypass, 1) + PARSE_TAB ("AAD", out->aad) + PARSE_TAB ("IV", out->iv) PARSE_ARRAY ("DATA", out->data) + PARSE_INT ("DATALEN", out->data_len) /* for checking */ END_PARSE () } @@@ -70,11 -67,11 +71,12 @@@ int check_encrypted_data (ENCRYPTED_DAT { BEGIN_CHECK (fields) CHECK_INT ("CHANNELID", first->channel_id, second->channel_id) - CHECK_TAB ("IV", first->iv, second->iv) CHECK_INT ("BYPASSLEN", first->bypass_len, second->bypass_len) CHECK_ARRAY ("BYPASS", first->bypass, second->bypass) + CHECK_TAB ("AAD", first->aad, second->aad) + CHECK_TAB ("IV", first->iv, second->iv) CHECK_ARRAY ("DATA", first->data, second->data) + CHECK_INT ("DATALEN", first->data_len, second->data_len) END_CHECK () } diff --cc simulator/script-black.eth index 0000000,8d370b7..a1ab4d5 mode 000000,100644..100644 --- a/simulator/script-black.eth +++ b/simulator/script-black.eth @@@ -1,0 -1,17 +1,16 @@@ + # Black test script + + # key provisioning + + # radio configuration + R:BYPASS BYPASSED_CROSS_ASYNC DATA="Radio\ Configuration" + + # send data -#R:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 AAD=00:00:00 IV=@iv.txt DATA=@encryptred.txt -R:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 IV=@iv.txt DATA=@encrypted.txt ++R:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 AAD=00:00:00 IV=@iv.txt DATA=@encrypted.txt + + # wait + SLEEP 1000 + + # receive data + T:CROSS_CRYPTO DECRYPT_CROSS_ASYNC CHANNELID=0 IV=@iv.txt DATA=@encrypted.txt + diff --cc simulator/script-red.eth index 0000000,d9e23bf..4557216 mode 000000,100644..100644 --- a/simulator/script-red.eth +++ b/simulator/script-red.eth @@@ -1,0 -1,20 +1,20 @@@ + # Red test script + + # key provisioning + T:PROVISIONING LOAD_KEY_REQ KEYID=0 KEY=@key.txt + R:PROVISIONING LOAD_KEY_RESP STATUS=0 + + # radio configuration + T:BYPASS BYPASS_CROSS_ASYNC DATA="Radio\ Configuration" + T:CONTROL STATUS_REQ + R:CONTROL STATUS_RESP STATUS=4 + + # send data + T:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC CHANNELID=0 DATA=@plaintext.txt + + # wait + SLEEP 1000 + + # receive data -R:CROSS_CRYPTO DECRYPTED_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 DATA=@decrypted.txt ++R:CROSS_CRYPTO DECRYPTED_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 AAD=00:00:00:00 DATA=@decrypted.txt + diff --cc simulator/script-secu.eth index 0000000,bfd6ef0..e57d73c mode 000000,100644..100644 --- a/simulator/script-secu.eth +++ b/simulator/script-secu.eth @@@ -1,0 -1,25 +1,23 @@@ + # Secu test script + + # key provisioning + R:PROVISIONING LOAD_KEY_REQ KEYID=0 KEY=@key.txt + T:PROVISIONING LOAD_KEY_RESP STATUS=0 + + # radio configuration + R:BYPASS_RED BYPASS_CROSS_ASYNC DATA="Radio\ Configuration" + T:BYPASS_BLACK BYPASSED_CROSS_ASYNC DATA="Radio\ Configuration" + R:CONTROL STATUS_REQ + T:CONTROL STATUS_RESP STATUS=4 + + # send data -#R:CROSS_CRYPTO_RED ENCRYPT_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 AAD=00:00:00:00 DATA=@plaintext.txt -R:CROSS_CRYPTO_RED ENCRYPT_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 DATA=@plaintext.txt ++R:CROSS_CRYPTO_RED ENCRYPT_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 AAD=00:00:00:00 DATA=@plaintext.txt + T:CROSS_CRYPTO_BLACK ENCRYPTED_CROSS_ASYNC CHANNELID=0 IV=@iv.txt DATA=@encrypted.txt + + # wait + #SLEEP 1000 + + # receive data -#R:CROSS_CRYPTO_BLACK DECRYPT_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 ADD=00:00:00:00 IV=@iv.txt DATA=@encrypted.txt -R:CROSS_CRYPTO_BLACK DECRYPT_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 IV=@iv.txt DATA=@encrypted.txt ++R:CROSS_CRYPTO_BLACK DECRYPT_CROSS_ASYNC CHANNELID=0 BYPASSLEN=0 AAD=00:00:00:00 IV=@iv.txt DATA=@encrypted.txt + T:CROSS_CRYPTO_RED DECRYPTED_CROSS_ASYNC CHANNELID=0 DATA=@decrypted.txt + diff --cc test/script-cross_crypto.eth index 0000000,dd7ce18..1cd78c6 mode 000000,100644..100644 --- a/test/script-cross_crypto.eth +++ b/test/script-cross_crypto.eth @@@ -1,0 -1,13 +1,13 @@@ + # Cross crypto test script + -T:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC CHANNELID=2 BYPASSLEN=4 BYPASS=11:22:33:44 DATA=@test/script-local_crypto.eth -R:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC CHANNELID=2 BYPASSLEN=4 BYPASS=11:22:33:44 ++T:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC CHANNELID=2 BYPASSLEN=4 BYPASS=11:22:33:44 AAD=01:02:03:04 DATA=@script-local_crypto.eth ++R:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC CHANNELID=2 BYPASSLEN=4 BYPASS=11:22:33:44 AAD=01:02:03:04 + -T:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC CHANNELID=9 BYPASSLEN=1 BYPASS=55 DATA=@test/script-local_crypto.eth -R:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC BYPASSLEN=1 BYPASS=55 ++T:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC CHANNELID=9 BYPASSLEN=1 BYPASS=55 DATA=@script-local_crypto.eth ++R:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC BYPASSLEN=1 BYPASS=55 DATA=@script-local_crypto.eth + + T:CROSS_CRYPTO DECRYPT_CROSS_ASYNC CHANNELID=5 BYPASSLEN=0 DATA=@test/script-local_crypto.eth + R:CROSS_CRYPTO DECRYPT_CROSS_ASYNC DATA=@test/script-local_crypto.eth + + T:CROSS_CRYPTO DECRYPTED_CROSS_ASYNC CHANNELID=0 BYPASSLEN=4 BYPASS=11:22:33:44 DATA=@test/script-cross_crypto.eth + R:CROSS_CRYPTO DECRYPTED_CROSS_ASYNC DATA=@test/script-cross_crypto.eth CHANNELID=0