Merge changes Ib2a3c881,Ia9b17f4e

* changes:
  trusty/apploader: Handle APPLOADER_ERR_NOT_ENCRYPTED
  trusty/apploader: Add missing doc for enum value
This commit is contained in:
Marco Nelissen 2022-08-21 23:22:38 +00:00 committed by Gerrit Code Review
commit 7df90c1a38
2 changed files with 8 additions and 0 deletions

View file

@ -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;

View file

@ -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,
};
/**