diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-20 20:03:42 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-20 20:03:42 +0200 |
commit | bcb015239c5affc81414d45726aff7efac020a5f (patch) | |
tree | ce9cf683304b2d70ae800bb6811842b375904beb /applypatch/bspatch.cpp | |
parent | Merge "applypatch: Dump patch info on mismatching patching result." (diff) | |
parent | applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch. (diff) | |
download | android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar.gz android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar.bz2 android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar.lz android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar.xz android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar.zst android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.zip |
Diffstat (limited to '')
-rw-r--r-- | applypatch/bspatch.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/applypatch/bspatch.cpp b/applypatch/bspatch.cpp index 912dbbdd8..ba33c3a9c 100644 --- a/applypatch/bspatch.cpp +++ b/applypatch/bspatch.cpp @@ -66,18 +66,12 @@ void ShowBSDiffLicense() { } int ApplyBSDiffPatch(const unsigned char* old_data, size_t old_size, const Value& patch, - size_t patch_offset, SinkFn sink, SHA_CTX* ctx) { - auto sha_sink = [&sink, &ctx](const uint8_t* data, size_t len) { - len = sink(data, len); - if (ctx) SHA1_Update(ctx, data, len); - return len; - }; - + size_t patch_offset, SinkFn sink) { CHECK_LE(patch_offset, patch.data.size()); int result = bsdiff::bspatch(old_data, old_size, reinterpret_cast<const uint8_t*>(&patch.data[patch_offset]), - patch.data.size() - patch_offset, sha_sink); + patch.data.size() - patch_offset, sink); if (result != 0) { LOG(ERROR) << "bspatch failed, result: " << result; // print SHA1 of the patch in the case of a data error. |