combined patch for:

src/platform/vboot_reference/tests/sha_test_vectors.h

Index: src/platform/vboot_reference/tests/sha_test_vectors.h
diff --git a/src/platform/vboot_reference/tests/sha_test_vectors.h b/src/platform/vboot_reference/tests/sha_test_vectors.h
index 640c06b969b917821ef2ea3479e6a374d7bb747c..c75e9165c09ec39919ee0ba82e0ef1663f5e3caf 100644
--- a/src/platform/vboot_reference/tests/sha_test_vectors.h
+++ b/src/platform/vboot_reference/tests/sha_test_vectors.h
@@ -8,15 +8,15 @@
 #ifndef VBOOT_REFERENCE_SHA_TEST_VECTORS_H_
 #define VBOOT_REFERENCE_SHA_TEST_VECTORS_H_
 
-#include "sha.h"
+#include "cryptolib.h"
 
-char *oneblock_msg = "abc";
-char *multiblock_msg1 = "abcdbcdecdefdefgefghfghighijhijkijkl"
+char* oneblock_msg = "abc";
+char* multiblock_msg1 = "abcdbcdecdefdefgefghfghighijhijkijkl"
     "jklmklmnlmnomnopnopq";
-char *multiblock_msg2= "abcdefghbcdefghicdefghijdefghijkefghi"
+char* multiblock_msg2= "abcdefghbcdefghicdefghijdefghijkefghi"
     "jklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnop"
     "qrsmnopqrstnopqrstu";
-char *long_msg;
+char* long_msg;
 
 uint8_t sha1_results[][SHA1_DIGEST_SIZE] = {
   {