adapt to ICD v15

diff --git a/pdu_encrypted_data.c b/pdu_encrypted_data.c
index 12356a41cebed51360286993d7cd1c12697c707a..2552fddae1fc22f4558f47960431edffedb6ce8c 100644 (file)
--- a/pdu_encrypted_data.c
+++ b/pdu_encrypted_data.c
@@ -24,8 +24,8 @@ int parse_encrypted_data (char *line, ENCRYPTED_DATA_t *out)
     PARSE_INT ("CHANNELID", out->channel_id)
     PARSE_INT ("BYPASSLEN", out->bypass_len)
     PARSE_ARRAY ("BYPASS", out->bypass, 1)
-    PARSE_TAB ("AAD", out->aad)
     PARSE_TAB ("IV", out->iv)
+    PARSE_TAB ("AAD", out->aad)
     PARSE_ARRAY ("DATA", out->data)
     PARSE_INT ("DATALEN", out->data_len) /* for checking */
     END_PARSE ()
@@ -37,8 +37,8 @@ int format_encrypted_data (ENCRYPTED_DATA_t *in, char *buffer, int maxlen)
     FORMAT_INT ("CHANNELID", in->channel_id)
     FORMAT_INT ("BYPASSLEN", in->bypass_len)
     FORMAT_ARRAY ("BYPASS", in->bypass)
-    FORMAT_TAB ("AAD", in->aad)
     FORMAT_TAB ("IV", in->iv)
+    FORMAT_TAB ("AAD", in->aad)
     FORMAT_ARRAY ("DATA", in->data)
     END_FORMAT ()
 }
@@ -49,8 +49,8 @@ int serial_encrypted_data (ENCRYPTED_DATA_t *in, uint8_t *buffer, int maxlen)
     SERIAL_INT ("CHANNELID", in->channel_id)
     SERIAL_INT ("BYPASSLEN", in->bypass_len)
     SERIAL_ARRAY ("BYPASS", in->bypass)
-    SERIAL_TAB ("AAD", in->aad)
     SERIAL_TAB ("IV", in->iv)
+    SERIAL_TAB ("AAD", in->aad)
     SERIAL_ARRAY ("DATA", in->data)
     END_SERIAL ()
 }
@@ -61,8 +61,8 @@ int deserial_encrypted_data (uint8_t *buffer, int len, ENCRYPTED_DATA_t *out)
     DESERIAL_INT ("CHANNELID", out->channel_id)
     DESERIAL_INT ("BYPASSLEN", out->bypass_len)
     DESERIAL_ARRAY ("BYPASS", out->bypass, 1)
-    DESERIAL_TAB ("AAD", out->aad)
     DESERIAL_TAB ("IV", out->iv)
+    DESERIAL_TAB ("AAD", out->aad)
     DESERIAL_ARRAY ("DATA", out->data)
     END_DESERIAL ()
 }
@@ -73,8 +73,8 @@ int check_encrypted_data (ENCRYPTED_DATA_t *first, ENCRYPTED_DATA_t *second, int
     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_TAB ("IV", first->iv, second->iv)
+    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 --git a/pdu_encrypted_data.h b/pdu_encrypted_data.h
index 9f3faedbd2d19fd54b85c346bb3889a4eec5c247..7031b4cd59cbbdb501ee76589e33d99563717f01 100644 (file)
--- a/pdu_encrypted_data.h
+++ b/pdu_encrypted_data.h
@@ -36,8 +36,8 @@ typedef struct {
     uint8_t channel_id; /**< channel index */
     uint8_t bypass_len; /**< attached bypass message length */
     uint8_t bypass[255]; /**< attached bypass message */
-    uint8_t aad[AAD_LENGTH]; /**< additional authenticated data */
     uint8_t iv[IV_LENGTH]; /**< initialization vector */
+    uint8_t aad[AAD_LENGTH]; /**< additional authenticated data */
     uint16_t data_len; /**< data length (must be aligned to 16 bytes) */
     uint8_t data[16 * ((MOREP_PAYLOAD - 2 - AAD_LENGTH - IV_LENGTH) / 16)]; /**< data message + tag */
 } ENCRYPTED_DATA_t;