fix(esp_encrypted_img): address some review comments

Author: mahavirj

esp_encrypted_img/private_include/esp_encrypted_img_priv.h

@@ -86,7 +86,7 @@ typedef struct {
 #define HEADER_DATA_SIZE    sizeof(pre_enc_bin_header)
 
 // Magic Byte is created using command: echo -n "esp_encrypted_img" | sha256sum
-static uint32_t esp_enc_img_magic = 0x0788b6cf;
+static const uint32_t esp_enc_img_magic = 0x0788b6cf;
 
 #if defined(CONFIG_PRE_ENCRYPTED_OTA_USE_ECIES)
 #define HMAC_OUTPUT_SIZE    32

esp_encrypted_img/src/esp_encrypted_img.c

@@ -15,6 +15,7 @@
 
 #include "mbedtls/version.h"
 #include "mbedtls/pk.h"
+#include "sdkconfig.h"
 
 #if !defined(CONFIG_MBEDTLS_VER_4_X_SUPPORT)
 #include "mbedtls/entropy.h"
@@ -74,6 +75,7 @@ static esp_err_t gcm_init_and_set_key(esp_encrypted_img_t *handle, const unsigne
     status = psa_aead_decrypt_setup(&handle->psa_aead_op, handle->psa_gcm_key_id, PSA_ALG_GCM);
     if (status != PSA_SUCCESS) {
         ESP_LOGE(TAG, "psa_aead_decrypt_setup failed: %d", (int)status);
+        psa_aead_abort(&handle->psa_aead_op);
         psa_destroy_key(handle->psa_gcm_key_id);
         return ESP_FAIL;
     }

esp_encrypted_img/test_apps/main/esp_encrypted_img_test.c

@@ -28,17 +28,20 @@ void setUp(void)
     uint8_t ciphertext[16];
     const uint8_t key[16] = { 0 };
 #if defined(CONFIG_MBEDTLS_VER_4_X_SUPPORT)
-    psa_crypto_init();
+    psa_status_t status = psa_crypto_init();
+    TEST_ASSERT_EQUAL(PSA_SUCCESS, status);
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
     psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_ENCRYPT);
     psa_set_key_algorithm(&attributes, PSA_ALG_ECB_NO_PADDING);
     psa_set_key_type(&attributes, PSA_KEY_TYPE_AES);
     psa_set_key_bits(&attributes, 128);
     psa_key_id_t key_id;
-    psa_import_key(&attributes, key, sizeof(key), &key_id);
+    status = psa_import_key(&attributes, key, sizeof(key), &key_id);
+    TEST_ASSERT_EQUAL(PSA_SUCCESS, status);
     size_t output_length;
-    psa_cipher_encrypt(key_id, PSA_ALG_ECB_NO_PADDING, plaintext, sizeof(plaintext),
-                       ciphertext, sizeof(ciphertext), &output_length);
+    status = psa_cipher_encrypt(key_id, PSA_ALG_ECB_NO_PADDING, plaintext, sizeof(plaintext),
+                                ciphertext, sizeof(ciphertext), &output_length);
+    TEST_ASSERT_EQUAL(PSA_SUCCESS, status);
     psa_destroy_key(key_id);
 #else
     mbedtls_aes_context ctx;