Zip install: this will allow TWRP to check md5 and sha256 checksums
for zip installs.
Change-Id: I1fb6af777e08aea29bedaf2e6a9b385ae3b03fac
diff --git a/twrpDigestDriver.cpp b/twrpDigestDriver.cpp
old mode 100644
new mode 100755
index c27545c..079d0b8
--- a/twrpDigestDriver.cpp
+++ b/twrpDigestDriver.cpp
@@ -33,7 +33,7 @@
#include "twrpDigest/twrpSHA.hpp"
-bool twrpDigestDriver::Check_Restore_File_Digest(const string& Filename) {
+bool twrpDigestDriver::Check_File_Digest(const string& Filename) {
twrpDigest *digest;
string digestfile = Filename, file_name = Filename;
string digest_str;
@@ -47,18 +47,31 @@
use_sha2 = true;
}
else {
- digest = new twrpMD5();
- digestfile = Filename + ".md5";
-
+ digestfile = Filename + ".sha256";
+ if (TWFunc::Path_Exists(digestfile)) {
+ digest = new twrpSHA256();
+ use_sha2 = true;
+ } else {
+ digest = new twrpMD5();
+ digestfile = Filename + ".md5";
+ if (!TWFunc::Path_Exists(digestfile)) {
+ digestfile = Filename + ".md5sum";
+ }
+ }
}
#else
digest = new twrpMD5();
digestfile = Filename + ".md5";
+ if (!TWFunc::Path_Exists(digestfile)) {
+ digestfile = Filename + ".md5sum";
+ }
#endif
if (!TWFunc::Path_Exists(digestfile)) {
- gui_msg(Msg(msg::kError, "no_digest_found=No digest file found for '{1}'. Please unselect Enable Digest verification to restore.")(Filename));
+ if (Filename.find(".zip") == std::string::npos) {
+ gui_msg(Msg(msg::kError, "no_digest_found=No digest file found for '{1}'. Please unselect Enable Digest verification to restore.")(Filename));
+ }
delete digest;
return false;
}
@@ -80,6 +93,7 @@
LOGINFO("SHA2 Digest: %s %s\n", digest_str.c_str(), TWFunc::Get_Filename(Filename).c_str());
else
LOGINFO("MD5 Digest: %s %s\n", digest_str.c_str(), TWFunc::Get_Filename(Filename).c_str());
+ gui_msg(Msg("digest_matched=Digest matched for '{1}'.")(Filename));
delete digest;
return true;
}
@@ -87,7 +101,6 @@
gui_msg(Msg(msg::kError, "digest_fail_match=Digest failed to match on '{1}'.")(Filename));
delete digest;
return false;
-
}
bool twrpDigestDriver::Check_Digest(string Full_Filename) {
@@ -103,13 +116,13 @@
if (!TWFunc::Path_Exists(split_filename))
break;
LOGINFO("split_filename: %s\n", split_filename);
- if (!Check_Restore_File_Digest(split_filename))
+ if (!Check_File_Digest(split_filename))
return false;
index++;
}
return true;
}
- return Check_Restore_File_Digest(Full_Filename); // Single file archive
+ return Check_File_Digest(Full_Filename); // Single file archive
}
bool twrpDigestDriver::Write_Digest(string Full_Filename) {