Add support to encrypt image types on the fly.
CRs-Fixed: 312830
Change-Id: I4cf5c6f70cf4af5e7c8a77765d58efd2c63c39d0
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index c67ce40..5a68a4b 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -1040,17 +1040,29 @@
unsigned int *magic_number = (unsigned int *) data;
int ret=0;
- if (magic_number[0] == SSD_HEADER_MAGIC_0 &&
- magic_number[1] == SSD_HEADER_MAGIC_1)
+ if (magic_number[0] == DECRYPT_MAGIC_0 &&
+ magic_number[1] == DECRYPT_MAGIC_1)
{
#ifdef SSD_ENABLE
- ret = decrypt_img_scm((uint32 **) &data, &sz);
+ ret = decrypt_scm((uint32 **) &data, &sz);
#endif
if (ret != 0) {
dprintf(CRITICAL, "ERROR: Invalid secure image\n");
return;
}
}
+ else if (magic_number[0] == ENCRYPT_MAGIC_0 &&
+ magic_number[1] == ENCRYPT_MAGIC_1)
+ {
+#ifdef SSD_ENABLE
+ ret = encrypt_scm((uint32 **) &data, &sz);
+#endif
+ if (ret != 0) {
+ dprintf(CRITICAL, "ERROR: Encryption Failure\n");
+ return;
+ }
+ }
+
sparse_header = (sparse_header_t *) data;
if (sparse_header->magic != SPARSE_HEADER_MAGIC)
cmd_flash_mmc_img(arg, data, sz);