summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2019-10-08 01:21:37 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-10-08 01:21:37 +0200
commitce1e355bd5b0929504391c29df367488ea5cbd66 (patch)
treebc0c476cc0d4ef36bf51230055d4d30be1ba1c15
parentMerge "minadbd: Return battery level via getprop." am: e0e34a7f5c am: 58b5a5a550 (diff)
parentMerge "Run BORINGSSL_self_test() in updater_main" am: 8316f2f09a (diff)
downloadandroid_bootable_recovery-ce1e355bd5b0929504391c29df367488ea5cbd66.tar
android_bootable_recovery-ce1e355bd5b0929504391c29df367488ea5cbd66.tar.gz
android_bootable_recovery-ce1e355bd5b0929504391c29df367488ea5cbd66.tar.bz2
android_bootable_recovery-ce1e355bd5b0929504391c29df367488ea5cbd66.tar.lz
android_bootable_recovery-ce1e355bd5b0929504391c29df367488ea5cbd66.tar.xz
android_bootable_recovery-ce1e355bd5b0929504391c29df367488ea5cbd66.tar.zst
android_bootable_recovery-ce1e355bd5b0929504391c29df367488ea5cbd66.zip
-rw-r--r--updater/updater_main.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/updater/updater_main.cpp b/updater/updater_main.cpp
index 055a8ac76..33d5b5b47 100644
--- a/updater/updater_main.cpp
+++ b/updater/updater_main.cpp
@@ -22,6 +22,7 @@
#include <android-base/logging.h>
#include <android-base/parseint.h>
+#include <openssl/crypto.h>
#include <selinux/android.h>
#include <selinux/label.h>
#include <selinux/selinux.h>
@@ -56,22 +57,28 @@ int main(int argc, char** argv) {
// (which is redirected to recovery.log).
android::base::InitLogging(argv, &UpdaterLogger);
+ // Run the libcrypto KAT(known answer tests) based self tests.
+ if (BORINGSSL_self_test() != 1) {
+ LOG(ERROR) << "Failed to run the boringssl self tests";
+ return EXIT_FAILURE;
+ }
+
if (argc != 4 && argc != 5) {
LOG(ERROR) << "unexpected number of arguments: " << argc;
- return 1;
+ return EXIT_FAILURE;
}
char* version = argv[1];
if ((version[0] != '1' && version[0] != '2' && version[0] != '3') || version[1] != '\0') {
// We support version 1, 2, or 3.
LOG(ERROR) << "wrong updater binary API; expected 1, 2, or 3; got " << argv[1];
- return 1;
+ return EXIT_FAILURE;
}
int fd;
if (!android::base::ParseInt(argv[2], &fd)) {
LOG(ERROR) << "Failed to parse fd in " << argv[2];
- return 1;
+ return EXIT_FAILURE;
}
std::string package_name = argv[3];
@@ -82,7 +89,7 @@ int main(int argc, char** argv) {
is_retry = true;
} else {
LOG(ERROR) << "unexpected argument: " << argv[4];
- return 1;
+ return EXIT_FAILURE;
}
}
@@ -98,12 +105,12 @@ int main(int argc, char** argv) {
Updater updater(std::make_unique<UpdaterRuntime>(sehandle));
if (!updater.Init(fd, package_name, is_retry)) {
- return 1;
+ return EXIT_FAILURE;
}
if (!updater.RunUpdate()) {
- return 1;
+ return EXIT_FAILURE;
}
- return 0;
+ return EXIT_SUCCESS;
} \ No newline at end of file