summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@google.com>2019-05-22 17:25:09 -0700
committerDuncan Laurie <dlaurie@google.com>2019-05-23 00:38:00 +0000
commit7b19d50b5aa11defc45d485b89c745ebab4361ab (patch)
tree75688b45ec9fa1a988ee330fce05390691e6f5ad
parent89a586ed1731fd123a43a6375123cb878fa77714 (diff)
downloadvboot-7b19d50b5aa11defc45d485b89c745ebab4361ab.tar.gz
Revert "vboot: de-externalize vb2_digest_buffer function"
This reverts commit 3cc1bf259c977b88925179f01d4f8a75c0da57aa. BUG=none TEST=none Change-Id: Ied6e3d3b0e70d719375d533609c828fd3ccdfdc1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1626765 Reviewed-by: Duncan Laurie <dlaurie@google.com> Commit-Queue: Duncan Laurie <dlaurie@google.com> Tested-by: Duncan Laurie <dlaurie@google.com>
-rw-r--r--firmware/2lib/2api.c9
-rw-r--r--firmware/2lib/include/2api.h16
2 files changed, 25 insertions, 0 deletions
diff --git a/firmware/2lib/2api.c b/firmware/2lib/2api.c
index f10a1e69..ada229a5 100644
--- a/firmware/2lib/2api.c
+++ b/firmware/2lib/2api.c
@@ -223,3 +223,12 @@ int vb2api_get_pcr_digest(struct vb2_context *ctx,
return VB2_SUCCESS;
}
+
+int vb2api_digest_buffer(const uint8_t *buf,
+ uint32_t size,
+ enum vb2_hash_algorithm hash_alg,
+ uint8_t *digest,
+ uint32_t digest_size)
+{
+ return vb2_digest_buffer(buf, size, hash_alg, digest, digest_size);
+}
diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h
index e7964e28..eed7e126 100644
--- a/firmware/2lib/include/2api.h
+++ b/firmware/2lib/include/2api.h
@@ -712,6 +712,22 @@ int vb2ex_hwcrypto_digest_extend(const uint8_t *buf, uint32_t size);
*/
int vb2ex_hwcrypto_digest_finalize(uint8_t *digest, uint32_t digest_size);
+/**
+ * Calculate the digest of a buffer and store the result.
+ *
+ * @param buf Data to hash
+ * @param size Length of data in bytes
+ * @param hash_alg Hash algorithm
+ * @param digest Destination for digest
+ * @param digest_size Length of digest buffer in bytes.
+ * @return VB2_SUCCESS, or non-zero on error.
+ */
+int vb2api_digest_buffer(const uint8_t *buf,
+ uint32_t size,
+ enum vb2_hash_algorithm hash_alg,
+ uint8_t *digest,
+ uint32_t digest_size);
+
/*
* Set the current TPM mode value, and validate that it was changed. If one
* of the following occurs, the function call fails: