combined patch for:

src/platform/vboot_reference/crypto/sha1.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
- */
-
-/* SHA-1 implementation largely based on libmincrypt in the the Android
+ *
+ * SHA-1 implementation largely based on libmincrypt in the the Android
  * Open Source Project (platorm/system/core.git/libmincrypt/sha.c
  */
 
-#include "sha.h"
+#include "cryptolib.h"
+#include "utility.h"
+
 
 /* Some machines lack byteswap.h and endian.h. These have to use the
  * slower code, even if they're little-endian.
  */
 
 #if defined(HAVE_ENDIAN_H) && defined(HAVE_LITTLE_ENDIAN)
 
 #include <byteswap.h>
 #include <memory.h>
 
@@ skipping 106 matching lines @@
   ctx->state[4] += E;
 }
 
 void SHA1_update(SHA1_CTX* ctx, const uint8_t* data, uint64_t len) {
   int i = ctx->count % sizeof(ctx->buf);
   const uint8_t* p = (const uint8_t*)data;
 
   ctx->count += len;
 
   while (len > sizeof(ctx->buf) - i) {
-    memcpy(&ctx->buf.b[i], p, sizeof(ctx->buf) - i);
+    Memcpy(&ctx->buf.b[i], p, sizeof(ctx->buf) - i);
     len -= sizeof(ctx->buf) - i;
     p += sizeof(ctx->buf) - i;
     SHA1_Transform(ctx);
     i = 0;
   }
 
   while (len--) {
     ctx->buf.b[i++] = *p++;
     if (i == sizeof(ctx->buf)) {
       SHA1_Transform(ctx);
@@ skipping 132 matching lines @@
   int i;
   SHA1_CTX ctx;
   SHA1_init(&ctx);
   SHA1_update(&ctx, data, len);
   p = SHA1_final(&ctx);
   for (i = 0; i < SHA1_DIGEST_SIZE; ++i) {
     digest[i] = *p++;
   }
   return digest;
 }