diff options
| author | Kees Cook <keescook@chromium.org> | 2012-05-22 18:05:53 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-05-22 19:52:55 -0700 |
| commit | 201fe0bb55ddb5a7270c45aa58bcb91258c0a9ce (patch) | |
| tree | 78155d6c7068e54695077715c9ed9472091ee821 /tests/sha_benchmark.c | |
| parent | b75d8adcc01f08cf5a6d87b78aeb1d7cdfcd22af (diff) | |
| download | vboot-201fe0bb55ddb5a7270c45aa58bcb91258c0a9ce.tar.gz | |
cryptolib: rename SHA* function to avoid openssl collisionfirmware-link-2348.B
When linking tools that need OpenSSL functions on the target, the
resolution of SHA* functions was being redirected to the firmware
cryptolib instead of the OpenSSL implementations, which was causing
OpenSSL calls to crash. This renames the internal implementations
to avoid the collision.
BUG=None
TEST=make runtests passes, mount-encrypted runs on target again.
Change-Id: Ica4fb04faf203ae3b4118c540f18d40239753810
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/23305
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'tests/sha_benchmark.c')
| -rw-r--r-- | tests/sha_benchmark.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/sha_benchmark.c b/tests/sha_benchmark.c index 9f4da367..a5bfc538 100644 --- a/tests/sha_benchmark.c +++ b/tests/sha_benchmark.c @@ -21,9 +21,9 @@ typedef struct HashFxTable { } HashFxTable; HashFxTable hash_functions[NUM_HASH_ALGORITHMS] = { - {SHA1, "sha1"}, - {SHA256, "sha256"}, - {SHA512, "sha512"} + {internal_SHA1, "sha1"}, + {internal_SHA256, "sha256"}, + {internal_SHA512, "sha512"} }; int main(int argc, char* argv[]) { |