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

Commit 64a4d858 authored by Jim Blackler's avatar Jim Blackler Committed by Automerger Merge Worker
Browse files

Merge "Revert "Delete KM1"" am: 6fd74f0a am: b36ab6b5 am: f6bc183f am:... 

Merge "Revert "Delete KM1"" am: 6fd74f0a am: b36ab6b5 am: f6bc183f am: 35780df7 am: b60ec710

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1853100

Change-Id: I9c570c56ebccb39381465af0a962fce057267e47
parents 92ad5b94 b60ec710

trusty/keymaster/TrustyKeymaster.cpp

+30 −0
Original line number Diff line number Diff line
@@ -112,6 +112,36 @@ void TrustyKeymaster::GetVersion(const GetVersionRequest& request, GetVersionRes 
    ForwardCommand(KM_GET_VERSION, request, response);

}



void TrustyKeymaster::SupportedAlgorithms(const SupportedAlgorithmsRequest& request,

                                          SupportedAlgorithmsResponse* response) {

    ForwardCommand(KM_GET_SUPPORTED_ALGORITHMS, request, response);

}



void TrustyKeymaster::SupportedBlockModes(const SupportedBlockModesRequest& request,

                                          SupportedBlockModesResponse* response) {

    ForwardCommand(KM_GET_SUPPORTED_BLOCK_MODES, request, response);

}



void TrustyKeymaster::SupportedPaddingModes(const SupportedPaddingModesRequest& request,

                                            SupportedPaddingModesResponse* response) {

    ForwardCommand(KM_GET_SUPPORTED_PADDING_MODES, request, response);

}



void TrustyKeymaster::SupportedDigests(const SupportedDigestsRequest& request,

                                       SupportedDigestsResponse* response) {

    ForwardCommand(KM_GET_SUPPORTED_DIGESTS, request, response);

}



void TrustyKeymaster::SupportedImportFormats(const SupportedImportFormatsRequest& request,

                                             SupportedImportFormatsResponse* response) {

    ForwardCommand(KM_GET_SUPPORTED_IMPORT_FORMATS, request, response);

}



void TrustyKeymaster::SupportedExportFormats(const SupportedExportFormatsRequest& request,

                                             SupportedExportFormatsResponse* response) {

    ForwardCommand(KM_GET_SUPPORTED_EXPORT_FORMATS, request, response);

}



void TrustyKeymaster::AddRngEntropy(const AddEntropyRequest& request,

                                    AddEntropyResponse* response) {

    ForwardCommand(KM_ADD_RNG_ENTROPY, request, response);

trusty/keymaster/include/trusty_keymaster/TrustyKeymaster.h

+12 −0
Original line number Diff line number Diff line
@@ -27,6 +27,18 @@ class TrustyKeymaster { 
    ~TrustyKeymaster();

    int Initialize(KmVersion version);

    void GetVersion(const GetVersionRequest& request, GetVersionResponse* response);

    void SupportedAlgorithms(const SupportedAlgorithmsRequest& request,

                             SupportedAlgorithmsResponse* response);

    void SupportedBlockModes(const SupportedBlockModesRequest& request,

                             SupportedBlockModesResponse* response);

    void SupportedPaddingModes(const SupportedPaddingModesRequest& request,

                               SupportedPaddingModesResponse* response);

    void SupportedDigests(const SupportedDigestsRequest& request,

                          SupportedDigestsResponse* response);

    void SupportedImportFormats(const SupportedImportFormatsRequest& request,

                                SupportedImportFormatsResponse* response);

    void SupportedExportFormats(const SupportedExportFormatsRequest& request,

                                SupportedExportFormatsResponse* response);

    void AddRngEntropy(const AddEntropyRequest& request, AddEntropyResponse* response);

    void Configure(const ConfigureRequest& request, ConfigureResponse* response);

    void GenerateKey(const GenerateKeyRequest& request, GenerateKeyResponse* response);