Merge "Revert "Delete KM1""

This commit is contained in:
Jim Blackler 2021-10-11 14:04:30 +00:00 committed by Gerrit Code Review
commit 6fd74f0a1c
2 changed files with 42 additions and 0 deletions

View file

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

View file

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