mutex: more clock fixes

[fio.git] / crc / sha512.c

diff --git a/crc/sha512.c b/crc/sha512.c
index 1f9ebb434baf2707f909d33c63b48ae84ed06a64..9268a4900e01006ddae9ca2c6fc745a5e146e523 100644 (file)
--- a/crc/sha512.c
+++ b/crc/sha512.c
@@ -13,17 +13,10 @@
 
 #include <string.h>
 #include <inttypes.h>
-#include <byteswap.h>
-#include <endian.h>
 
+#include "../lib/bswap.h"
 #include "sha512.h"
 
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define        __be64_to_cpu(x)        __bswap_64(x)
-#else
-#define __be64_to_cpu(x)       (x)
-#endif
-
 #define SHA384_DIGEST_SIZE 48
 #define SHA512_DIGEST_SIZE 64
 #define SHA384_HMAC_BLOCK_SIZE 128
@@ -169,10 +162,10 @@ void sha512_init(struct sha512_ctx *sctx)
 void sha512_update(struct sha512_ctx *sctx, const uint8_t *data,
                   unsigned int len)
 {
-       unsigned int i, index, part_len;
+       unsigned int i, idx, part_len;
 
        /* Compute number of bytes mod 128 */
-       index = (unsigned int)((sctx->count[0] >> 3) & 0x7F);
+       idx = (unsigned int)((sctx->count[0] >> 3) & 0x7F);
        
        /* Update number of bits */
        if ((sctx->count[0] += (len << 3)) < (len << 3)) {
@@ -182,23 +175,23 @@ void sha512_update(struct sha512_ctx *sctx, const uint8_t *data,
                sctx->count[1] += (len >> 29);
        }
        
-        part_len = 128 - index;
+        part_len = 128 - idx;
        
        /* Transform as many times as possible. */
        if (len >= part_len) {
-               memcpy(&sctx->buf[index], data, part_len);
+               memcpy(&sctx->buf[idx], data, part_len);
                sha512_transform(sctx->state, sctx->W, sctx->buf);
 
                for (i = part_len; i + 127 < len; i+=128)
                        sha512_transform(sctx->state, sctx->W, &data[i]);
 
-               index = 0;
+               idx = 0;
        } else {
                i = 0;
        }
 
        /* Buffer remaining input */
-       memcpy(&sctx->buf[index], &data[i], len - i);
+       memcpy(&sctx->buf[idx], &data[i], len - i);
 
        /* erase our data */
        memset(sctx->W, 0, sizeof(sctx->W));