github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-29 21:27:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev-v2.3

Browse Source
This commit is contained in:
Gunnar Skjold
2024-01-26 19:29:58 +01:00
parent 1ba452213d e575ab755c
commit 3b531fab5b
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/AmsDecoder/include/GcmParser.h
View File

@@ -15,12 +15,6 @@
#define GCM_DECRYPT_FAILED -52 #define GCM_DECRYPT_FAILED -52
#define GCM_ENCRYPTION_KEY_FAILED -53 #define GCM_ENCRYPTION_KEY_FAILED -53
typedef struct GCMSizeDef {
uint8_t flag;
uint16_t format;
} __attribute__((packed)) GCMSizeDef;
class GCMParser { class GCMParser {
public: public:
GCMParser(uint8_t *encryption_key, uint8_t *authentication_key); GCMParser(uint8_t *encryption_key, uint8_t *authentication_key);

36
lib/AmsDecoder/src/GcmParser.cpp
View File

@@ -33,33 +33,35 @@ int8_t GCMParser::parse(uint8_t *d, DataParserContext &ctx) {
memcpy(ctx.system_title, ptr, systemTitleLength); memcpy(ctx.system_title, ptr, systemTitleLength);
memcpy(initialization_vector, ctx.system_title, systemTitleLength); memcpy(initialization_vector, ctx.system_title, systemTitleLength);
int len = 0; uint32_t len = 0;
int headersize = 2 + systemTitleLength; uint32_t headersize = 2 + systemTitleLength;
ptr += systemTitleLength; ptr += systemTitleLength;
if(((*ptr) & 0xFF) == 0x81) { if(((*ptr) & 0xFF) == 0x81) {
ptr++;
len = *ptr;
// 1-byte payload length // 1-byte payload length
ptr++; ptr++;
len = *ptr++;
headersize += 2; headersize += 2;
} else if(((*ptr) & 0xFF) == 0x82) { } else if(((*ptr) & 0xFF) == 0x82) {
GCMSizeDef* h = (GCMSizeDef*) ptr;
// 2-byte payload length // 2-byte payload length
len = (ntohs(h->format) & 0xFFFF);
ptr += 3;
headersize += 3;
} else {
len = *ptr;
ptr++; ptr++;
len = *ptr++ << 8;
len |= *ptr++;
headersize += 3;
} else if(((*ptr) & 0xFF) == 0x84) {
// 4-byte payload length
ptr++;
len = *ptr++ << 24;
len |= *ptr++ << 16;
len |= *ptr++ << 8;
len |= *ptr++;
headersize += 5;
} else {
len = *ptr++;
headersize++; headersize++;
} }
if(len + headersize > ctx.length) if(len + headersize > ctx.length)
return DATA_PARSE_INCOMPLETE; return DATA_PARSE_INCOMPLETE;
//Serial.printf("\nL: %d : %d, %d\n", length, len, headersize);
uint8_t additional_authenticated_data[17]; uint8_t additional_authenticated_data[17];
memcpy(additional_authenticated_data, ptr, 1); memcpy(additional_authenticated_data, ptr, 1);
@@ -76,6 +78,7 @@ int8_t GCMParser::parse(uint8_t *d, DataParserContext &ctx) {
int footersize = 0; int footersize = 0;
// Authentication enabled // Authentication enabled
bool authenticate = false;
uint8_t authentication_tag[12]; uint8_t authentication_tag[12];
uint8_t authkeylen = 0, aadlen = 0; uint8_t authkeylen = 0, aadlen = 0;
if((sec & 0x10) == 0x10) { if((sec & 0x10) == 0x10) {
@@ -84,6 +87,7 @@ int8_t GCMParser::parse(uint8_t *d, DataParserContext &ctx) {
footersize += authkeylen; footersize += authkeylen;
memcpy(additional_authenticated_data + 1, authentication_key, 16); memcpy(additional_authenticated_data + 1, authentication_key, 16);
memcpy(authentication_tag, ptr + len - footersize - 5, authkeylen); memcpy(authentication_tag, ptr + len - footersize - 5, authkeylen);
for(uint8_t i; i < 16; i++) authenticate |= authentication_key[i] > 0;
} }
#if defined(ESP8266) #if defined(ESP8266)
@@ -92,7 +96,7 @@ int8_t GCMParser::parse(uint8_t *d, DataParserContext &ctx) {
br_aes_ct_ctr_init(&bc, encryption_key, 16); br_aes_ct_ctr_init(&bc, encryption_key, 16);
br_gcm_init(&gcmCtx, &bc.vtable, br_ghash_ctmul32); br_gcm_init(&gcmCtx, &bc.vtable, br_ghash_ctmul32);
br_gcm_reset(&gcmCtx, initialization_vector, sizeof(initialization_vector)); br_gcm_reset(&gcmCtx, initialization_vector, sizeof(initialization_vector));
if(authkeylen > 0) { if(authenticate) {
br_gcm_aad_inject(&gcmCtx, additional_authenticated_data, aadlen); br_gcm_aad_inject(&gcmCtx, additional_authenticated_data, aadlen);
} }
br_gcm_flip(&gcmCtx); br_gcm_flip(&gcmCtx);
@@ -110,7 +114,7 @@ int8_t GCMParser::parse(uint8_t *d, DataParserContext &ctx) {
if (0 != success) { if (0 != success) {
return GCM_ENCRYPTION_KEY_FAILED; return GCM_ENCRYPTION_KEY_FAILED;
} }
if (0 < authkeylen) { if (authenticate) {
success = mbedtls_gcm_auth_decrypt(&m_ctx, sizeof(cipher_text), initialization_vector, sizeof(initialization_vector), success = mbedtls_gcm_auth_decrypt(&m_ctx, sizeof(cipher_text), initialization_vector, sizeof(initialization_vector),
additional_authenticated_data, aadlen, authentication_tag, authkeylen, additional_authenticated_data, aadlen, authentication_tag, authkeylen,
cipher_text, (unsigned char*)(ptr)); cipher_text, (unsigned char*)(ptr));