diff options
Diffstat (limited to 'twinstall.cpp')
-rwxr-xr-x[-rw-r--r--] | twinstall.cpp | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/twinstall.cpp b/twinstall.cpp index fa6b8594e..e4b11a7b6 100644..100755 --- a/twinstall.cpp +++ b/twinstall.cpp @@ -332,41 +332,12 @@ int TWinstall_zip(const char* path, int* wipe_cache) { if (strlen(path) < 9 || strncmp(path, "/sideload", 9) != 0) { string digest_str; string Full_Filename = path; - string digest_file = path; - string defmd5file = digest_file + ".md5sum"; - - if (TWFunc::Path_Exists(defmd5file)) { - digest_file += ".md5sum"; - } - else { - digest_file += ".md5"; - } gui_msg("check_for_digest=Checking for Digest file..."); - if (!TWFunc::Path_Exists(digest_file)) { - gui_msg("no_digest=Skipping Digest check: no Digest file found"); - } - else { - if (TWFunc::read_file(digest_file, digest_str) != 0) { - LOGERR("Skipping MD5 check: MD5 file unreadable\n"); - } - else { - twrpDigest *digest = new twrpMD5(); - if (!twrpDigestDriver::stream_file_to_digest(Full_Filename, digest)) { - delete digest; - return INSTALL_CORRUPT; - } - string digest_check = digest->return_digest_string(); - if (digest_str == digest_check) { - gui_msg(Msg("digest_matched=Digest matched for '{1}'.")(path)); - } - else { + + if (!twrpDigestDriver::Check_File_Digest(Full_Filename)) { LOGERR("Aborting zip install: Digest verification failed\n"); - delete digest; return INSTALL_CORRUPT; - } - delete digest; - } } } |