commit c3bda9f3edb1aefea44a3fe4d741aca63c57c9bc
author Per Larsen <perl@immunant.com> Sat Aug 20 23:16:53 2022 -0700
committer Armelle Laine <armellel@google.com> Wed Sep 07 04:58:00 2022 +0000
tree 08dd67897bbab89673f47e1582ef6eccc760daba
parent 63818fc16d664a76650ad4f0b457cbd2500d9c5c

trusty/apploader: Handle APPLOADER_ERR_NOT_ENCRYPTED

Add a specific error message to the Android CLI tool for the case
where the apploader rejected an attempt to load an application
which requested encryption of its ELF image via its manifest while
containing an unencrypted ELF image.

Bug: 241824652
Change-Id: Ib2a3c881015700492b8166be38c41753bf51b3b2
(cherry picked from commit db9a554a2f30c1592f8825303a4d5131d6b32a2e)
Merged-In: Ib2a3c881015700492b8166be38c41753bf51b3b2

trusty/apploader/apploader.cpp

diff --git a/trusty/apploader/apploader.cpp b/trusty/apploader/apploader.cpp
index 278499f..17d083c 100644
--- a/trusty/apploader/apploader.cpp
+++ b/trusty/apploader/apploader.cpp
@@ -226,6 +226,9 @@
         case APPLOADER_ERR_POLICY_VIOLATION:
             LOG(ERROR) << "Error: loading denied by policy engine";
             break;
+        case APPLOADER_ERR_NOT_ENCRYPTED:
+            LOG(ERROR) << "Error: unmet application encryption requirement";
+            break;
         default:
             LOG(ERROR) << "Unrecognized error: " << resp.error;
             break;

trusty/apploader/apploader_ipc.h

diff --git a/trusty/apploader/apploader_ipc.h b/trusty/apploader/apploader_ipc.h
index ed5cbde..f037692 100644
--- a/trusty/apploader/apploader_ipc.h
+++ b/trusty/apploader/apploader_ipc.h
@@ -48,6 +48,7 @@
  * @APPLOADER_ERR_POLICY_VIOLATION:     signature verification succeeded but
  *                                      key+manifest combination not allowed
  *                                      by app loader policy engine
+ * @APPLOADER_ERR_NOT_ENCRYPTED:        unmet application encryption requirement
  */
 enum apploader_error : uint32_t {
     APPLOADER_NO_ERROR = 0,
@@ -60,6 +61,7 @@
     APPLOADER_ERR_INTERNAL,
     APPLOADER_ERR_INVALID_VERSION,
     APPLOADER_ERR_POLICY_VIOLATION,
+    APPLOADER_ERR_NOT_ENCRYPTED,
 };
 
 /**