github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-05-05 15:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed decrypt on esp32 without auth key

Browse Source
This commit is contained in:
Gunnar Skjold
2022-03-26 09:31:49 +01:00
parent 3e937a4e5d
commit 6cdb943763
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ams/hdlc.cpp
View File

@@ -241,13 +241,28 @@ int HDLC_validate(const uint8_t* d, int length, HDLCConfig* config, CosemDateTim
if (0 != success) { if (0 != success) {
return HDLC_ENCRYPTION_KEY_FAILED; return HDLC_ENCRYPTION_KEY_FAILED;
} }
success = mbedtls_gcm_auth_decrypt(&m_ctx, sizeof(cipher_text), config->initialization_vector, sizeof(config->initialization_vector), if (0 < authkeylen) {
config->additional_authenticated_data, aadlen, config->authentication_tag, authkeylen, success = mbedtls_gcm_auth_decrypt(&m_ctx, sizeof(cipher_text), config->initialization_vector, sizeof(config->initialization_vector),
cipher_text, (unsigned char*)(ptr)); config->additional_authenticated_data, aadlen, config->authentication_tag, authkeylen,
if (authkeylen > 0 && success == MBEDTLS_ERR_GCM_AUTH_FAILED) { cipher_text, (unsigned char*)(ptr));
return HDLC_ENCRYPTION_AUTH_FAILED; if (authkeylen > 0 && success == MBEDTLS_ERR_GCM_AUTH_FAILED) {
} else if(success == MBEDTLS_ERR_GCM_BAD_INPUT) { mbedtls_gcm_free(&m_ctx);
return HDLC_ENCRYPTION_DECRYPT_FAILED; return HDLC_ENCRYPTION_AUTH_FAILED;
} else if(success == MBEDTLS_ERR_GCM_BAD_INPUT) {
mbedtls_gcm_free(&m_ctx);
return HDLC_ENCRYPTION_DECRYPT_FAILED;
}
} else {
success = mbedtls_gcm_starts(&m_ctx, MBEDTLS_GCM_DECRYPT, config->initialization_vector, sizeof(config->initialization_vector),NULL, 0);
if (0 != success) {
mbedtls_gcm_free(&m_ctx);
return HDLC_ENCRYPTION_DECRYPT_FAILED;
}
success = mbedtls_gcm_update(&m_ctx, sizeof(cipher_text), cipher_text, (unsigned char*)(ptr));
if (0 != success) {
mbedtls_gcm_free(&m_ctx);
return HDLC_ENCRYPTION_DECRYPT_FAILED;
}
} }
mbedtls_gcm_free(&m_ctx); mbedtls_gcm_free(&m_ctx);
#endif #endif