summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-09-08 23:29:56 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-09-08 23:29:56 +0000
commit9c6a104cfeb943e7bf8124ca21cfa4eaefb11160 (patch)
tree08dd67897bbab89673f47e1582ef6eccc760daba
parentded642c0eb3c53a6927d4432c7ec7954b3acfe9c (diff)
parentc3bda9f3edb1aefea44a3fe4d741aca63c57c9bc (diff)
downloadcore-android13-qpr1-s1-release.tar.gz
Snap for 9043175 from c3bda9f3edb1aefea44a3fe4d741aca63c57c9bc to tm-qpr1-releaseandroid-13.0.0_r18android-13.0.0_r17android-13.0.0_r16android13-qpr1-s1-release
Change-Id: I6333380e3683e6cb29162467ea202d8afa58abb2
-rw-r--r--trusty/apploader/apploader.cpp3
-rw-r--r--trusty/apploader/apploader_ipc.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/trusty/apploader/apploader.cpp b/trusty/apploader/apploader.cpp
index 278499f17..17d083c73 100644
--- a/trusty/apploader/apploader.cpp
+++ b/trusty/apploader/apploader.cpp
@@ -226,6 +226,9 @@ static ssize_t read_response(int tipc_fd) {
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;
diff --git a/trusty/apploader/apploader_ipc.h b/trusty/apploader/apploader_ipc.h
index 306596eba..f0376929c 100644
--- a/trusty/apploader/apploader_ipc.h
+++ b/trusty/apploader/apploader_ipc.h
@@ -45,6 +45,10 @@ enum apploader_command : uint32_t {
* @APPLOADER_ERR_INTERNAL: miscellaneous or internal apploader
* error not covered by the above
* @APPLOADER_ERR_INVALID_VERSION: invalid application version
+ * @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,
@@ -57,6 +61,7 @@ enum apploader_error : uint32_t {
APPLOADER_ERR_INTERNAL,
APPLOADER_ERR_INVALID_VERSION,
APPLOADER_ERR_POLICY_VIOLATION,
+ APPLOADER_ERR_NOT_ENCRYPTED,
};
/**