diff options
author | Tao Bao <tbao@google.com> | 2016-02-04 20:22:39 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-04 20:22:39 +0100 |
commit | 7b6027dde49e5f14e9cde6de4fa542b146f41a2f (patch) | |
tree | d9d9b43a46b67a65a702c1b3142a3455f1fef386 /updater/install.cpp | |
parent | Merge "uncrypt: add options to setup bcb and clear bcb." (diff) | |
parent | Merge "Switch from mincrypt to BoringSSL in applypatch and updater." (diff) | |
download | android_bootable_recovery-7b6027dde49e5f14e9cde6de4fa542b146f41a2f.tar android_bootable_recovery-7b6027dde49e5f14e9cde6de4fa542b146f41a2f.tar.gz android_bootable_recovery-7b6027dde49e5f14e9cde6de4fa542b146f41a2f.tar.bz2 android_bootable_recovery-7b6027dde49e5f14e9cde6de4fa542b146f41a2f.tar.lz android_bootable_recovery-7b6027dde49e5f14e9cde6de4fa542b146f41a2f.tar.xz android_bootable_recovery-7b6027dde49e5f14e9cde6de4fa542b146f41a2f.tar.zst android_bootable_recovery-7b6027dde49e5f14e9cde6de4fa542b146f41a2f.zip |
Diffstat (limited to '')
-rw-r--r-- | updater/install.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/updater/install.cpp b/updater/install.cpp index b09086964..5326b12a8 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -44,7 +44,7 @@ #include "cutils/misc.h" #include "cutils/properties.h" #include "edify/expr.h" -#include "mincrypt/sha.h" +#include "openssl/sha.h" #include "minzip/DirUtil.h" #include "mtdutils/mounts.h" #include "mtdutils/mtdutils.h" @@ -91,10 +91,10 @@ void uiPrintf(State* state, const char* format, ...) { // Take a sha-1 digest and return it as a newly-allocated hex string. char* PrintSha1(const uint8_t* digest) { - char* buffer = reinterpret_cast<char*>(malloc(SHA_DIGEST_SIZE*2 + 1)); + char* buffer = reinterpret_cast<char*>(malloc(SHA_DIGEST_LENGTH*2 + 1)); const char* alphabet = "0123456789abcdef"; size_t i; - for (i = 0; i < SHA_DIGEST_SIZE; ++i) { + for (i = 0; i < SHA_DIGEST_LENGTH; ++i) { buffer[i*2] = alphabet[(digest[i] >> 4) & 0xf]; buffer[i*2+1] = alphabet[digest[i] & 0xf]; } @@ -1357,8 +1357,8 @@ Value* Sha1CheckFn(const char* name, State* state, int argc, Expr* argv[]) { if (args[0]->size < 0) { return StringValue(strdup("")); } - uint8_t digest[SHA_DIGEST_SIZE]; - SHA_hash(args[0]->data, args[0]->size, digest); + uint8_t digest[SHA_DIGEST_LENGTH]; + SHA1(reinterpret_cast<uint8_t*>(args[0]->data), args[0]->size, digest); FreeValue(args[0]); if (argc == 1) { @@ -1366,7 +1366,7 @@ Value* Sha1CheckFn(const char* name, State* state, int argc, Expr* argv[]) { } int i; - uint8_t* arg_digest = reinterpret_cast<uint8_t*>(malloc(SHA_DIGEST_SIZE)); + uint8_t* arg_digest = reinterpret_cast<uint8_t*>(malloc(SHA_DIGEST_LENGTH)); for (i = 1; i < argc; ++i) { if (args[i]->type != VAL_STRING) { printf("%s(): arg %d is not a string; skipping", @@ -1375,7 +1375,7 @@ Value* Sha1CheckFn(const char* name, State* state, int argc, Expr* argv[]) { // Warn about bad args and skip them. printf("%s(): error parsing \"%s\" as sha-1; skipping", name, args[i]->data); - } else if (memcmp(digest, arg_digest, SHA_DIGEST_SIZE) == 0) { + } else if (memcmp(digest, arg_digest, SHA_DIGEST_LENGTH) == 0) { break; } FreeValue(args[i]); |