diff options
| author | big biff <bigbiff@teamw.in> | 2016-11-08 00:54:28 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit> | 2016-11-08 00:54:28 +0100 |
| commit | bb0da94f40d8fe7779deea78e3ad2c1eeb1c4180 (patch) | |
| tree | f4f929e0da5f6ee51f7d4a442b6165394f242edd /twinstall.cpp | |
| parent | Fix image flashing: attempt 2 (diff) | |
| parent | MD5 verification sanity (diff) | |
| download | android_bootable_recovery-android-7.0.tar android_bootable_recovery-android-7.0.tar.gz android_bootable_recovery-android-7.0.tar.bz2 android_bootable_recovery-android-7.0.tar.lz android_bootable_recovery-android-7.0.tar.xz android_bootable_recovery-android-7.0.tar.zst android_bootable_recovery-android-7.0.zip | |
Diffstat (limited to '')
| -rw-r--r-- | twinstall.cpp | 15 |
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; } } |