diff options
| author | Gabe Black <gabeblack@chromium.org> | 2013-03-16 04:03:40 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-03-19 16:55:44 -0700 |
| commit | ac8805e7e9bd40c03baf44e37b26f28d9b763ab5 (patch) | |
| tree | 9297d954f0fc50bb9de01fb9672ddaea076e2f01 /firmware/lib/cryptolib/sha512.c | |
| parent | 77f55ca1cd282ac6c540ea3a8bacbc35c2600d60 (diff) | |
| download | vboot-ac8805e7e9bd40c03baf44e37b26f28d9b763ab5.tar.gz | |
Get rid of some crufty macros.
These were macros that were never used, or that were only set to one thing and
could be substituted up front.
I left in code guarded by the HAVE_ENDIAN_H and HAVE_LITTLE_ENDIAN macros even
though those are never defined because they guard a reportedly significantly
faster implementation of some functionality, at least according to a comment
in the source. It would be a good idea to enable that code path and see if it
really does make a big difference before removing it entirely.
BUG=None
TEST=Built for Link, Daisy, and the host with FEATURES=test. Built depthcharge
for Link and booted in normal mode.
BRANCH=None
Change-Id: I934a4dd0da169ac018ba07350d56924ab88b1acc
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/45687
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Diffstat (limited to 'firmware/lib/cryptolib/sha512.c')
| -rw-r--r-- | firmware/lib/cryptolib/sha512.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/firmware/lib/cryptolib/sha512.c b/firmware/lib/cryptolib/sha512.c index 3a45be51..66c9a35f 100644 --- a/firmware/lib/cryptolib/sha512.c +++ b/firmware/lib/cryptolib/sha512.c @@ -57,16 +57,16 @@ *((str) + 0) = (uint8_t) ((x) >> 24); \ } -#define UNPACK64(x, str) \ - { \ - *((str) + 7) = (uint8_t) x; \ - *((str) + 6) = (uint8_t) UINT64_RSHIFT(x, 8); \ - *((str) + 5) = (uint8_t) UINT64_RSHIFT(x, 16); \ - *((str) + 4) = (uint8_t) UINT64_RSHIFT(x, 24); \ - *((str) + 3) = (uint8_t) UINT64_RSHIFT(x, 32); \ - *((str) + 2) = (uint8_t) UINT64_RSHIFT(x, 40); \ - *((str) + 1) = (uint8_t) UINT64_RSHIFT(x, 48); \ - *((str) + 0) = (uint8_t) UINT64_RSHIFT(x, 56); \ +#define UNPACK64(x, str) \ + { \ + *((str) + 7) = (uint8_t) x; \ + *((str) + 6) = (uint8_t) ((uint64_t)x >> 8); \ + *((str) + 5) = (uint8_t) ((uint64_t)x >> 16); \ + *((str) + 4) = (uint8_t) ((uint64_t)x >> 24); \ + *((str) + 3) = (uint8_t) ((uint64_t)x >> 32); \ + *((str) + 2) = (uint8_t) ((uint64_t)x >> 40); \ + *((str) + 1) = (uint8_t) ((uint64_t)x >> 48); \ + *((str) + 0) = (uint8_t) ((uint64_t)x >> 56); \ } #define PACK64(str, x) \ |