Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3bda9f3 authored by Per Larsen's avatar Per Larsen Committed by Armelle Laine
Browse files

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 db9a554a)
Merged-In: Ib2a3c881015700492b8166be38c41753bf51b3b2
parent 63818fc1

trusty/apploader/apploader.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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;

trusty/apploader/apploader_ipc.h

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ enum apploader_command : uint32_t { 
 * @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 @@ enum apploader_error : uint32_t { 
    APPLOADER_ERR_INTERNAL,

    APPLOADER_ERR_INVALID_VERSION,

    APPLOADER_ERR_POLICY_VIOLATION,

    APPLOADER_ERR_NOT_ENCRYPTED,

};



/**