ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "acvp: handle flush commond in modulewrapper as stated in BoringSSL." into main

Browse source
This commit is contained in:
Yurii Shutkin 2023-10-09 15:36:47 +00:00 • committed by Gerrit Code Review
commit a7dd77670e
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
trusty/utils/acvp/trusty_modulewrapper.cpp
View file

@ -21,15 +21,16 @@
#include <android-base/result.h> #include <android-base/result.h>
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <errno.h> #include <errno.h>
#include <iostream>
#include <log/log.h> #include <log/log.h>
#include <modulewrapper.h> #include <modulewrapper.h>
#include <openssl/span.h> #include <openssl/span.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <trusty/tipc.h> #include <trusty/tipc.h>
#include <unistd.h> #include <unistd.h>
#include <iostream>
#include "acvp_ipc.h" #include "acvp_ipc.h"
@ -208,6 +209,11 @@ Result<void> ModuleWrapper::ForwardResponse() {
return {}; return {};
} }
static bool EqString(bssl::Span<const uint8_t> cmd, const char *str) {
return cmd.size() == strlen(str) &&
memcmp(str, cmd.data(), cmd.size()) == 0;
}
int main() { int main() {
for (;;) { for (;;) {
auto buffer = bssl::acvp::RequestBuffer::New(); auto buffer = bssl::acvp::RequestBuffer::New();
@ -217,17 +223,24 @@ int main() {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
ModuleWrapper wrapper; if (EqString(args[0], "flush")) {
auto res = wrapper.SendMessage(args); if (!bssl::acvp::FlushBuffer(STDOUT_FILENO)) {
if (!res.ok()) { ALOGE("Could not flush the buffer to stdout\n");
std::cerr << res.error() << std::endl; return EXIT_FAILURE;
return EXIT_FAILURE; }
} } else {
ModuleWrapper wrapper;
auto res = wrapper.SendMessage(args);
if (!res.ok()) {
std::cerr << res.error() << std::endl;
return EXIT_FAILURE;
}
res = wrapper.ForwardResponse(); res = wrapper.ForwardResponse();
if (!res.ok()) { if (!res.ok()) {
std::cerr << res.error() << std::endl; std::cerr << res.error() << std::endl;
return EXIT_FAILURE; return EXIT_FAILURE;
}
} }
} }