summaryrefslogtreecommitdiffstats
path: root/twinstall.cpp
diff options
context:
space:
mode:
authorJames Christopher Adduono <jc@adduono.com>2016-10-25 08:18:32 +0200
committerDees Troy <dees_troy@teamw.in>2016-11-30 16:30:22 +0100
commit79ae093c82ec6f714719ccdc97b03e1c184bdc01 (patch)
treef8f36a520de40efbea049b47c056aa8345c923b8 /twinstall.cpp
parentFix image flashing: attempt 2 (diff)
downloadandroid_bootable_recovery-79ae093c82ec6f714719ccdc97b03e1c184bdc01.tar
android_bootable_recovery-79ae093c82ec6f714719ccdc97b03e1c184bdc01.tar.gz
android_bootable_recovery-79ae093c82ec6f714719ccdc97b03e1c184bdc01.tar.bz2
android_bootable_recovery-79ae093c82ec6f714719ccdc97b03e1c184bdc01.tar.lz
android_bootable_recovery-79ae093c82ec6f714719ccdc97b03e1c184bdc01.tar.xz
android_bootable_recovery-79ae093c82ec6f714719ccdc97b03e1c184bdc01.tar.zst
android_bootable_recovery-79ae093c82ec6f714719ccdc97b03e1c184bdc01.zip
Diffstat (limited to 'twinstall.cpp')
-rw-r--r--twinstall.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/twinstall.cpp b/twinstall.cpp
index c2f98febc..50d286c45 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -296,9 +296,18 @@ extern "C" int TWinstall_zip(const char* path, int* wipe_cache) {
gui_msg("check_for_md5=Checking for MD5 file...");
twrpDigest md5sum;
md5sum.setfn(path);
- int md5_return = md5sum.verify_md5digest();
- if (md5_return == -2) { // md5 did not match
- LOGERR("Aborting zip install\n");
+ switch (md5sum.verify_md5digest()) {
+ case MD5_OK:
+ gui_msg(Msg("md5_matched=MD5 matched for '{1}'.")(path));
+ break;
+ case MD5_NOT_FOUND:
+ gui_msg("no_md5=Skipping MD5 check: no MD5 file found");
+ break;
+ case MD5_FILE_UNREADABLE:
+ LOGERR("Skipping MD5 check: MD5 file unreadable\n");
+ break;
+ case MD5_MATCH_FAIL: // md5 did not match
+ LOGERR("Aborting zip install: MD5 verification failed\n");
return INSTALL_CORRUPT;
}
}