summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2014-07-15 19:47:32 -0700
committerAaron Durbin <adurbin@google.com>2015-03-23 19:51:47 +0100
commit5799097be5bbfedf4e95902a9d7e3c572ac7ad83 (patch)
treeb51e8f3b38a88f5fad853cff61341a4de944eea0 /src/lib
parente73335ce8ec518035df525142e5e9f4b92ccd143 (diff)
downloadcoreboot-5799097be5bbfedf4e95902a9d7e3c572ac7ad83.tar.xz
vboot2: read secdata and nvdata
This code ports antirollback module and tpm library from platform/vboot_reference. names are modified to conform to coreboot's style. The rollback_index module is split in a bottom half and top half. The top half contains generic code which hides the underlying storage implementation. The bottom half implements the storage abstraction. With this change, the bottom half is moved to coreboot, while the top half stays in vboot_reference. TEST=Built with USE=+/-vboot2 for Blaze. Built Samus, Link. BUG=none Branch=none Original-Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Original-Change-Id: I77e3ae1a029e09d3cdefe8fd297a3b432bbb9e9e Original-Reviewed-on: https://chromium-review.googlesource.com/206065 Original-Reviewed-by: Randall Spangler <rspangler@chromium.org> Original-Reviewed-by: Luigi Semenzato <semenzato@chromium.org> (cherry picked from commit 6b66140ac979a991237bf1fe25e0a55244a406d0) Change-Id: Ia3b8f27d6b1c2055e898ce716c4a93782792599c Signed-off-by: Aaron Durbin <adurbin@chromium.org> Signed-off-by: Marc Jones <marc.jones@se-eng.com> Reviewed-on: http://review.coreboot.org/8615 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Makefile.inc1
-rw-r--r--src/lib/tlcl.c592
-rw-r--r--src/lib/tlcl_internal.h34
3 files changed, 243 insertions, 384 deletions
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 472bd8d8cc..beb3abe168 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -33,7 +33,6 @@ verstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
verstage-y += tlcl.c
verstage-$(CONFIG_GENERIC_UDELAY) += timer.c
-
romstage-y += memchr.c
romstage-y += memcmp.c
$(foreach arch,$(ARCH_SUPPORTED),\
diff --git a/src/lib/tlcl.c b/src/lib/tlcl.c
index bf2d27f99c..3cfc40841a 100644
--- a/src/lib/tlcl.c
+++ b/src/lib/tlcl.c
@@ -14,453 +14,313 @@
* time.
*/
-#include "sysincludes.h"
-
-#include "tlcl.h"
+#include <2api.h>
+#include <2sysincludes.h>
+#include <assert.h>
+#include <tpm_lite/tlcl.h>
+#include <tpm.h>
#include "tlcl_internal.h"
#include "tlcl_structures.h"
-#include "utility.h"
-#include "vboot_api.h"
#ifdef FOR_TEST
-/* Allow unit testing implementation of TlclSendReceive() */
-#undef CHROMEOS_ENVIRONMENT
+#include <stdio.h>
+#define VBDEBUG(format, args...) printf(format, ## args)
+#else
+#include <console/console.h>
+#define VBDEBUG(format, args...) printk(BIOS_DEBUG, format, ## args)
#endif
+static int tpm_send_receive(const uint8_t *request,
+ uint32_t request_length,
+ uint8_t *response,
+ uint32_t *response_length)
+{
+ size_t len = *response_length;
+ if (tis_sendrecv(request, request_length, response, &len))
+ return VB2_ERROR_UNKNOWN;
+ /* check 64->32bit overflow and (re)check response buffer overflow */
+ if (len > *response_length)
+ return VB2_ERROR_UNKNOWN;
+ *response_length = len;
+ return VB2_SUCCESS;
+}
+
/* Sets the size field of a TPM command. */
-static inline void SetTpmCommandSize(uint8_t* buffer, uint32_t size) {
- ToTpmUint32(buffer + sizeof(uint16_t), size);
+static inline void set_tpm_command_size(uint8_t* buffer, uint32_t size) {
+ to_tpm_uint32(buffer + sizeof(uint16_t), size);
}
/* Gets the size field of a TPM command. */
__attribute__((unused))
-static inline int TpmCommandSize(const uint8_t* buffer) {
- uint32_t size;
- FromTpmUint32(buffer + sizeof(uint16_t), &size);
- return (int) size;
-}
-
-/* Gets the size field of a TPM request or response. */
-int TlclPacketSize(const uint8_t* packet) {
- return TpmCommandSize(packet);
+static inline int tpm_command_size(const uint8_t* buffer) {
+ uint32_t size;
+ from_tpm_uint32(buffer + sizeof(uint16_t), &size);
+ return (int) size;
}
/* Gets the code field of a TPM command. */
-static inline int TpmCommandCode(const uint8_t* buffer) {
- uint32_t code;
- FromTpmUint32(buffer + sizeof(uint16_t) + sizeof(uint32_t), &code);
- return code;
+static inline int tpm_command_code(const uint8_t* buffer) {
+ uint32_t code;
+ from_tpm_uint32(buffer + sizeof(uint16_t) + sizeof(uint32_t), &code);
+ return code;
}
/* Gets the return code field of a TPM result. */
-static inline int TpmReturnCode(const uint8_t* buffer) {
- return TpmCommandCode(buffer);
+static inline int tpm_return_code(const uint8_t* buffer) {
+ return tpm_command_code(buffer);
}
/* Like TlclSendReceive below, but do not retry if NEEDS_SELFTEST or
* DOING_SELFTEST errors are returned.
*/
-static uint32_t TlclSendReceiveNoRetry(const uint8_t* request,
- uint8_t* response, int max_length) {
-
- uint32_t response_length = max_length;
- uint32_t result;
+static uint32_t tlcl_send_receive_no_retry(const uint8_t* request,
+ uint8_t* response, int max_length) {
+ uint32_t response_length = max_length;
+ uint32_t result;
-#ifdef EXTRA_LOGGING
- VBDEBUG(("TPM: command: %x%x %x%x%x%x %x%x%x%x\n",
- request[0], request[1],
- request[2], request[3], request[4], request[5],
- request[6], request[7], request[8], request[9]));
-#endif
+ result = tpm_send_receive(request, tpm_command_size(request),
+ response, &response_length);
+ if (0 != result) {
+ /* Communication with TPM failed, so response is garbage */
+ VBDEBUG("TPM: command 0x%x send/receive failed: 0x%x\n",
+ tpm_command_code(request), result);
+ return result;
+ }
+ /* Otherwise, use the result code from the response */
+ result = tpm_return_code(response);
- result = VbExTpmSendReceive(request, TpmCommandSize(request),
- response, &response_length);
- if (0 != result) {
- /* Communication with TPM failed, so response is garbage */
- VBDEBUG(("TPM: command 0x%x send/receive failed: 0x%x\n",
- TpmCommandCode(request), result));
- return result;
- }
- /* Otherwise, use the result code from the response */
- result = TpmReturnCode(response);
-
- /* TODO: add paranoia about returned response_length vs. max_length
- * (and possibly expected length from the response header). See
- * crosbug.com/17017 */
-
-#ifdef EXTRA_LOGGING
- VBDEBUG(("TPM: response: %x%x %x%x%x%x %x%x%x%x\n",
- response[0], response[1],
- response[2], response[3], response[4], response[5],
- response[6], response[7], response[8], response[9]));
-#endif
+ /* TODO: add paranoia about returned response_length vs. max_length
+ * (and possibly expected length from the response header). See
+ * crosbug.com/17017 */
- VBDEBUG(("TPM: command 0x%x returned 0x%x\n",
- TpmCommandCode(request), result));
+ VBDEBUG("TPM: command 0x%x returned 0x%x\n",
+ tpm_command_code(request), result);
- return result;
+return result;
}
/* Sends a TPM command and gets a response. Returns 0 if success or the TPM
- * error code if error. In the firmware, waits for the self test to complete
- * if needed. In the host, reports the first error without retries. */
-uint32_t TlclSendReceive(const uint8_t* request, uint8_t* response,
- int max_length) {
- uint32_t result = TlclSendReceiveNoRetry(request, response, max_length);
- /* When compiling for the firmware, hide command failures due to the self
- * test not having run or completed. */
-#ifndef CHROMEOS_ENVIRONMENT
- /* If the command fails because the self test has not completed, try it
- * again after attempting to ensure that the self test has completed. */
- if (result == TPM_E_NEEDS_SELFTEST || result == TPM_E_DOING_SELFTEST) {
- result = TlclContinueSelfTest();
- if (result != TPM_SUCCESS) {
- return result;
- }
+ * error code if error. Waits for the self test to complete if needed. */
+uint32_t tlcl_send_receive(const uint8_t* request, uint8_t* response,
+ int max_length) {
+ uint32_t result = tlcl_send_receive_no_retry(request, response,
+ max_length);
+ /* If the command fails because the self test has not completed, try it
+ * again after attempting to ensure that the self test has completed. */
+ if (result == TPM_E_NEEDS_SELFTEST || result == TPM_E_DOING_SELFTEST) {
+ result = tlcl_continue_self_test();
+ if (result != TPM_SUCCESS)
+ return result;
#if defined(TPM_BLOCKING_CONTINUESELFTEST) || defined(VB_RECOVERY_MODE)
- /* Retry only once */
- result = TlclSendReceiveNoRetry(request, response, max_length);
+ /* Retry only once */
+ result = tlcl_send_receive_no_retry(request, response,
+ max_length);
#else
- /* This needs serious testing. The TPM specification says: "iii. The
- * caller MUST wait for the actions of TPM_ContinueSelfTest to complete
- * before reissuing the command C1." But, if ContinueSelfTest is
- * non-blocking, how do we know that the actions have completed other than
- * trying again? */
- do {
- result = TlclSendReceiveNoRetry(request, response, max_length);
- } while (result == TPM_E_DOING_SELFTEST);
+ /* This needs serious testing. The TPM specification says: "iii.
+ * The caller MUST wait for the actions of TPM_ContinueSelfTest
+ * to complete before reissuing the command C1." But, if
+ * ContinueSelfTest is non-blocking, how do we know that the
+ * actions have completed other than trying again? */
+ do {
+ result = tlcl_send_receive_no_retry(request, response,
+ max_length);
+ } while (result == TPM_E_DOING_SELFTEST);
#endif
- }
-#endif /* ! defined(CHROMEOS_ENVIRONMENT) */
- return result;
+ }
+ return result;
}
/* Sends a command and returns the error code. */
-static uint32_t Send(const uint8_t* command) {
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
- return TlclSendReceive(command, response, sizeof(response));
+static uint32_t send(const uint8_t* command) {
+ uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
+ return tlcl_send_receive(command, response, sizeof(response));
}
/* Exported functions. */
-uint32_t TlclLibInit(void) {
- return VbExTpmInit();
-}
-
-uint32_t TlclLibClose(void) {
- return VbExTpmClose();
-}
-
-uint32_t TlclStartup(void) {
- VBDEBUG(("TPM: Startup\n"));
- return Send(tpm_startup_cmd.buffer);
-}
-
-uint32_t TlclSaveState(void) {
- VBDEBUG(("TPM: SaveState\n"));
- return Send(tpm_savestate_cmd.buffer);
-}
-
-uint32_t TlclResume(void) {
- VBDEBUG(("TPM: Resume\n"));
- return Send(tpm_resume_cmd.buffer);
+uint32_t tlcl_lib_init(void) {
+ if (tis_init())
+ return VB2_ERROR_UNKNOWN;
+ if (tis_open())
+ return VB2_ERROR_UNKNOWN;
+ return VB2_SUCCESS;
}
-uint32_t TlclSelfTestFull(void) {
- VBDEBUG(("TPM: Self test full\n"));
- return Send(tpm_selftestfull_cmd.buffer);
+uint32_t tlcl_startup(void) {
+ VBDEBUG("TPM: Startup\n");
+ return send(tpm_startup_cmd.buffer);
}
-uint32_t TlclContinueSelfTest(void) {
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
- VBDEBUG(("TPM: Continue self test\n"));
- /* Call the No Retry version of SendReceive to avoid recursion. */
- return TlclSendReceiveNoRetry(tpm_continueselftest_cmd.buffer,
- response, sizeof(response));
+uint32_t tlcl_resume(void) {
+ VBDEBUG("TPM: Resume\n");
+ return send(tpm_resume_cmd.buffer);
}
-uint32_t TlclDefineSpace(uint32_t index, uint32_t perm, uint32_t size) {
- struct s_tpm_nv_definespace_cmd cmd;
- VBDEBUG(("TPM: TlclDefineSpace(0x%x, 0x%x, %d)\n", index, perm, size));
- Memcpy(&cmd, &tpm_nv_definespace_cmd, sizeof(cmd));
- ToTpmUint32(cmd.buffer + tpm_nv_definespace_cmd.index, index);
- ToTpmUint32(cmd.buffer + tpm_nv_definespace_cmd.perm, perm);
- ToTpmUint32(cmd.buffer + tpm_nv_definespace_cmd.size, size);
- return Send(cmd.buffer);
+uint32_t tlcl_self_test_full(void)
+{
+ VBDEBUG("TPM: Self test full\n");
+ return send(tpm_selftestfull_cmd.buffer);
}
-uint32_t TlclWrite(uint32_t index, const void* data, uint32_t length) {
- struct s_tpm_nv_write_cmd cmd;
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
- const int total_length =
- kTpmRequestHeaderLength + kWriteInfoLength + length;
-
- VBDEBUG(("TPM: TlclWrite(0x%x, %d)\n", index, length));
- Memcpy(&cmd, &tpm_nv_write_cmd, sizeof(cmd));
- VbAssert(total_length <= TPM_LARGE_ENOUGH_COMMAND_SIZE);
- SetTpmCommandSize(cmd.buffer, total_length);
-
- ToTpmUint32(cmd.buffer + tpm_nv_write_cmd.index, index);
- ToTpmUint32(cmd.buffer + tpm_nv_write_cmd.length, length);
- Memcpy(cmd.buffer + tpm_nv_write_cmd.data, data, length);
-
- return TlclSendReceive(cmd.buffer, response, sizeof(response));
+uint32_t tlcl_continue_self_test(void)
+{
+ uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
+ VBDEBUG("TPM: Continue self test\n");
+ /* Call the No Retry version of SendReceive to avoid recursion. */
+ return tlcl_send_receive_no_retry(tpm_continueselftest_cmd.buffer,
+ response, sizeof(response));
}
-uint32_t TlclRead(uint32_t index, void* data, uint32_t length) {
- struct s_tpm_nv_read_cmd cmd;
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
- uint32_t result_length;
- uint32_t result;
-
- VBDEBUG(("TPM: TlclRead(0x%x, %d)\n", index, length));
- Memcpy(&cmd, &tpm_nv_read_cmd, sizeof(cmd));
- ToTpmUint32(cmd.buffer + tpm_nv_read_cmd.index, index);
- ToTpmUint32(cmd.buffer + tpm_nv_read_cmd.length, length);
-
- result = TlclSendReceive(cmd.buffer, response, sizeof(response));
- if (result == TPM_SUCCESS && length > 0) {
- uint8_t* nv_read_cursor = response + kTpmResponseHeaderLength;
- FromTpmUint32(nv_read_cursor, &result_length);
- nv_read_cursor += sizeof(uint32_t);
- Memcpy(data, nv_read_cursor, result_length);
- }
-
- return result;
+uint32_t tlcl_define_space(uint32_t index, uint32_t perm, uint32_t size)
+{
+ struct s_tpm_nv_definespace_cmd cmd;
+ VBDEBUG("TPM: TlclDefineSpace(0x%x, 0x%x, %d)\n", index, perm, size);
+ memcpy(&cmd, &tpm_nv_definespace_cmd, sizeof(cmd));
+ to_tpm_uint32(cmd.buffer + tpm_nv_definespace_cmd.index, index);
+ to_tpm_uint32(cmd.buffer + tpm_nv_definespace_cmd.perm, perm);
+ to_tpm_uint32(cmd.buffer + tpm_nv_definespace_cmd.size, size);
+ return send(cmd.buffer);
}
-uint32_t TlclPCRRead(uint32_t index, void* data, uint32_t length) {
- struct s_tpm_pcr_read_cmd cmd;
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
- uint32_t result;
-
- VBDEBUG(("TPM: TlclPCRRead(0x%x, %d)\n", index, length));
- if (length < kPcrDigestLength) {
- return TPM_E_IOERROR;
- }
- Memcpy(&cmd, &tpm_pcr_read_cmd, sizeof(cmd));
- ToTpmUint32(cmd.buffer + tpm_pcr_read_cmd.pcrNum, index);
-
- result = TlclSendReceive(cmd.buffer, response, sizeof(response));
- if (result == TPM_SUCCESS) {
- uint8_t* pcr_read_cursor = response + kTpmResponseHeaderLength;
- Memcpy(data, pcr_read_cursor, kPcrDigestLength);
- }
-
- return result;
-}
+uint32_t tlcl_write(uint32_t index, const void* data, uint32_t length)
+{
+ struct s_tpm_nv_write_cmd cmd;
+ uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
+ const int total_length =
+ kTpmRequestHeaderLength + kWriteInfoLength + length;
-uint32_t TlclWriteLock(uint32_t index) {
- VBDEBUG(("TPM: Write lock 0x%x\n", index));
- return TlclWrite(index, NULL, 0);
-}
+ VBDEBUG("TPM: tlcl_write(0x%x, %d)\n", index, length);
+ memcpy(&cmd, &tpm_nv_write_cmd, sizeof(cmd));
+ assert(total_length <= TPM_LARGE_ENOUGH_COMMAND_SIZE);
+ set_tpm_command_size(cmd.buffer, total_length);
-uint32_t TlclReadLock(uint32_t index) {
- VBDEBUG(("TPM: Read lock 0x%x\n", index));
- return TlclRead(index, NULL, 0);
-}
+ to_tpm_uint32(cmd.buffer + tpm_nv_write_cmd.index, index);
+ to_tpm_uint32(cmd.buffer + tpm_nv_write_cmd.length, length);
+ memcpy(cmd.buffer + tpm_nv_write_cmd.data, data, length);
-uint32_t TlclAssertPhysicalPresence(void) {
- VBDEBUG(("TPM: Asserting physical presence\n"));
- return Send(tpm_ppassert_cmd.buffer);
+ return tlcl_send_receive(cmd.buffer, response, sizeof(response));
}
-uint32_t TlclPhysicalPresenceCMDEnable(void) {
- VBDEBUG(("TPM: Enable the physical presence command\n"));
- return Send(tpm_ppenable_cmd.buffer);
-}
+uint32_t tlcl_read(uint32_t index, void* data, uint32_t length)
+{
+ struct s_tpm_nv_read_cmd cmd;
+ uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
+ uint32_t result_length;
+ uint32_t result;
-uint32_t TlclFinalizePhysicalPresence(void) {
- VBDEBUG(("TPM: Enable PP cmd, disable HW pp, and set lifetime lock\n"));
- return Send(tpm_finalizepp_cmd.buffer);
-}
+ VBDEBUG("TPM: tlcl_read(0x%x, %d)\n", index, length);
+ memcpy(&cmd, &tpm_nv_read_cmd, sizeof(cmd));
+ to_tpm_uint32(cmd.buffer + tpm_nv_read_cmd.index, index);
+ to_tpm_uint32(cmd.buffer + tpm_nv_read_cmd.length, length);
-uint32_t TlclAssertPhysicalPresenceResult(void) {
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
- return TlclSendReceive(tpm_ppassert_cmd.buffer, response, sizeof(response));
-}
+ result = tlcl_send_receive(cmd.buffer, response, sizeof(response));
+ if (result == TPM_SUCCESS && length > 0) {
+ uint8_t* nv_read_cursor = response + kTpmResponseHeaderLength;
+ from_tpm_uint32(nv_read_cursor, &result_length);
+ nv_read_cursor += sizeof(uint32_t);
+ memcpy(data, nv_read_cursor, result_length);
+ }
-uint32_t TlclLockPhysicalPresence(void) {
- VBDEBUG(("TPM: Lock physical presence\n"));
- return Send(tpm_pplock_cmd.buffer);
+ return result;
}
-uint32_t TlclSetNvLocked(void) {
- VBDEBUG(("TPM: Set NV locked\n"));
- return TlclDefineSpace(TPM_NV_INDEX_LOCK, 0, 0);
-}
-
-int TlclIsOwned(void) {
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE + TPM_PUBEK_SIZE];
- uint32_t result;
- result = TlclSendReceive(tpm_readpubek_cmd.buffer,
- response, sizeof(response));
- return (result != TPM_SUCCESS);
-}
-uint32_t TlclForceClear(void) {
- VBDEBUG(("TPM: Force clear\n"));
- return Send(tpm_forceclear_cmd.buffer);
+uint32_t tlcl_assert_physical_presence(void) {
+ VBDEBUG("TPM: Asserting physical presence\n");
+ return send(tpm_ppassert_cmd.buffer);
}
-uint32_t TlclSetEnable(void) {
- VBDEBUG(("TPM: Enabling TPM\n"));
- return Send(tpm_physicalenable_cmd.buffer);
+uint32_t tlcl_physical_presence_cmd_enable(void) {
+ VBDEBUG("TPM: Enable the physical presence command\n");
+ return send(tpm_ppenable_cmd.buffer);
}
-uint32_t TlclClearEnable(void) {
- VBDEBUG(("TPM: Disabling TPM\n"));
- return Send(tpm_physicaldisable_cmd.buffer);
+uint32_t tlcl_finalize_physical_presence(void) {
+ VBDEBUG("TPM: Enable PP cmd, disable HW pp, and set lifetime lock\n");
+ return send(tpm_finalizepp_cmd.buffer);
}
-uint32_t TlclSetDeactivated(uint8_t flag) {
- struct s_tpm_physicalsetdeactivated_cmd cmd;
- VBDEBUG(("TPM: SetDeactivated(%d)\n", flag));
- Memcpy(&cmd, &tpm_physicalsetdeactivated_cmd, sizeof(cmd));
- *(cmd.buffer + cmd.deactivated) = flag;
- return Send(cmd.buffer);
+uint32_t tlcl_set_nv_locked(void) {
+ VBDEBUG("TPM: Set NV locked\n");
+ return tlcl_define_space(TPM_NV_INDEX_LOCK, 0, 0);
}
-uint32_t TlclGetPermanentFlags(TPM_PERMANENT_FLAGS* pflags) {
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
- uint32_t size;
- uint32_t result =
- TlclSendReceive(tpm_getflags_cmd.buffer, response, sizeof(response));
- if (result != TPM_SUCCESS)
- return result;
- FromTpmUint32(response + kTpmResponseHeaderLength, &size);
- /* TODO(crbug.com/379255): This fails. Find out why.
- * VbAssert(size == sizeof(TPM_PERMANENT_FLAGS));
- */
- Memcpy(pflags,
- response + kTpmResponseHeaderLength + sizeof(size),
- sizeof(TPM_PERMANENT_FLAGS));
- return result;
+uint32_t tlcl_force_clear(void) {
+ VBDEBUG("TPM: Force clear\n");
+ return send(tpm_forceclear_cmd.buffer);
}
-uint32_t TlclGetSTClearFlags(TPM_STCLEAR_FLAGS* vflags) {
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
- uint32_t size;
- uint32_t result =
- TlclSendReceive(tpm_getstclearflags_cmd.buffer, response, sizeof(response));
- if (result != TPM_SUCCESS)
- return result;
- FromTpmUint32(response + kTpmResponseHeaderLength, &size);
- /* Ugly assertion, but the struct is padded up by one byte. */
- /* TODO(crbug.com/379255): This fails. Find out why.
- * VbAssert(size == 7 && sizeof(TPM_STCLEAR_FLAGS) - 1 == 7);
- */
- Memcpy(vflags,
- response + kTpmResponseHeaderLength + sizeof(size),
- sizeof(TPM_STCLEAR_FLAGS));
- return result;
+uint32_t tlcl_set_enable(void) {
+ VBDEBUG("TPM: Enabling TPM\n");
+ return send(tpm_physicalenable_cmd.buffer);
}
-uint32_t TlclGetFlags(uint8_t* disable,
- uint8_t* deactivated,
- uint8_t *nvlocked) {
- TPM_PERMANENT_FLAGS pflags;
- uint32_t result = TlclGetPermanentFlags(&pflags);
- if (result == TPM_SUCCESS) {
- if (disable)
- *disable = pflags.disable;
- if (deactivated)
- *deactivated = pflags.deactivated;
- if (nvlocked)
- *nvlocked = pflags.nvLocked;
- VBDEBUG(("TPM: Got flags disable=%d, deactivated=%d, nvlocked=%d\n",
- pflags.disable, pflags.deactivated, pflags.nvLocked));
- }
- return result;
+uint32_t tlcl_set_deactivated(uint8_t flag)
+{
+ struct s_tpm_physicalsetdeactivated_cmd cmd;
+ VBDEBUG("TPM: SetDeactivated(%d)\n", flag);
+ memcpy(&cmd, &tpm_physicalsetdeactivated_cmd, sizeof(cmd));
+ *(cmd.buffer + cmd.deactivated) = flag;
+ return send(cmd.buffer);
+}
+
+uint32_t tlcl_get_permanent_flags(TPM_PERMANENT_FLAGS* pflags)
+{
+ uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
+ uint32_t size;
+ uint32_t result = tlcl_send_receive(tpm_getflags_cmd.buffer, response,
+ sizeof(response));
+ if (result != TPM_SUCCESS)
+ return result;
+ from_tpm_uint32(response + kTpmResponseHeaderLength, &size);
+ assert(size == sizeof(TPM_PERMANENT_FLAGS));
+ memcpy(pflags, response + kTpmResponseHeaderLength + sizeof(size),
+ sizeof(TPM_PERMANENT_FLAGS));
+ return result;
}
-uint32_t TlclSetGlobalLock(void) {
- uint32_t x;
- VBDEBUG(("TPM: Set global lock\n"));
- return TlclWrite(TPM_NV_INDEX0, (uint8_t*) &x, 0);
+uint32_t tlcl_get_flags(uint8_t* disable, uint8_t* deactivated,
+ uint8_t *nvlocked)
+{
+ TPM_PERMANENT_FLAGS pflags;
+ uint32_t result = tlcl_get_permanent_flags(&pflags);
+ if (result == TPM_SUCCESS) {
+ if (disable)
+ *disable = pflags.disable;
+ if (deactivated)
+ *deactivated = pflags.deactivated;
+ if (nvlocked)
+ *nvlocked = pflags.nvLocked;
+ VBDEBUG("TPM: flags disable=%d, deactivated=%d, nvlocked=%d\n",
+ pflags.disable, pflags.deactivated, pflags.nvLocked);
+ }
+ return result;
}
-uint32_t TlclExtend(int pcr_num, const uint8_t* in_digest,
- uint8_t* out_digest) {
- struct s_tpm_extend_cmd cmd;
- uint8_t response[kTpmResponseHeaderLength + kPcrDigestLength];
- uint32_t result;
-
- Memcpy(&cmd, &tpm_extend_cmd, sizeof(cmd));
- ToTpmUint32(cmd.buffer + tpm_extend_cmd.pcrNum, pcr_num);
- Memcpy(cmd.buffer + cmd.inDigest, in_digest, kPcrDigestLength);
+uint32_t tlcl_set_global_lock(void)
+{
+ uint32_t x;
+ VBDEBUG("TPM: Set global lock\n");
+ return tlcl_write(TPM_NV_INDEX0, (uint8_t*) &x, 0);
+}
- result = TlclSendReceive(cmd.buffer, response, sizeof(response));
- if (result != TPM_SUCCESS)
- return result;
+uint32_t tlcl_extend(int pcr_num, const uint8_t* in_digest,
+ uint8_t* out_digest)
+{
+ struct s_tpm_extend_cmd cmd;
+ uint8_t response[kTpmResponseHeaderLength + kPcrDigestLength];
+ uint32_t result;
- Memcpy(out_digest, response + kTpmResponseHeaderLength, kPcrDigestLength);
- return result;
-}
-
-uint32_t TlclGetPermissions(uint32_t index, uint32_t* permissions) {
- struct s_tpm_getpermissions_cmd cmd;
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
- uint8_t* nvdata;
- uint32_t result;
- uint32_t size;
-
- Memcpy(&cmd, &tpm_getpermissions_cmd, sizeof(cmd));
- ToTpmUint32(cmd.buffer + tpm_getpermissions_cmd.index, index);
- result = TlclSendReceive(cmd.buffer, response, sizeof(response));
- if (result != TPM_SUCCESS)
- return result;
-
- nvdata = response + kTpmResponseHeaderLength + sizeof(size);
- FromTpmUint32(nvdata + kNvDataPublicPermissionsOffset, permissions);
- return result;
-}
+ memcpy(&cmd, &tpm_extend_cmd, sizeof(cmd));
+ to_tpm_uint32(cmd.buffer + tpm_extend_cmd.pcrNum, pcr_num);
+ memcpy(cmd.buffer + cmd.inDigest, in_digest, kPcrDigestLength);
-uint32_t TlclGetOwnership(uint8_t* owned) {
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
- uint32_t size;
- uint32_t result =
- TlclSendReceive(tpm_getownership_cmd.buffer, response, sizeof(response));
- if (result != TPM_SUCCESS)
- return result;
- FromTpmUint32(response + kTpmResponseHeaderLength, &size);
- /* TODO(crbug.com/379255): This fails. Find out why.
- * VbAssert(size == sizeof(*owned));
- */
- Memcpy(owned,
- response + kTpmResponseHeaderLength + sizeof(size),
- sizeof(*owned));
- return result;
-}
+ result = tlcl_send_receive(cmd.buffer, response, sizeof(response));
+ if (result != TPM_SUCCESS)
+ return result;
-uint32_t TlclGetRandom(uint8_t* data, uint32_t length, uint32_t *size) {
- struct s_tpm_get_random_cmd cmd;
- uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE];
- uint32_t result;
-
- VBDEBUG(("TPM: TlclGetRandom(%d)\n", length));
- Memcpy(&cmd, &tpm_get_random_cmd, sizeof(cmd));
- ToTpmUint32(cmd.buffer + tpm_get_random_cmd.bytesRequested, length);
- /* There must be room in the response buffer for the bytes. */
- if (length > TPM_LARGE_ENOUGH_COMMAND_SIZE - kTpmResponseHeaderLength
- - sizeof(uint32_t)) {
- return TPM_E_IOERROR;
- }
-
- result = TlclSendReceive(cmd.buffer, response, sizeof(response));
- if (result == TPM_SUCCESS) {
- uint8_t* get_random_cursor;
- FromTpmUint32(response + kTpmResponseHeaderLength, size);
-
- /* There must be room in the target buffer for the bytes. */
- if (*size > length) {
- return TPM_E_RESPONSE_TOO_LARGE;
- }
- get_random_cursor = response + kTpmResponseHeaderLength
- + sizeof(uint32_t);
- Memcpy(data, get_random_cursor, *size);
- }
-
- return result;
+ memcpy(out_digest, response + kTpmResponseHeaderLength,
+ kPcrDigestLength);
+ return result;
}
diff --git a/src/lib/tlcl_internal.h b/src/lib/tlcl_internal.h
index 51fe6ef3f0..8261b0d0e1 100644
--- a/src/lib/tlcl_internal.h
+++ b/src/lib/tlcl_internal.h
@@ -18,44 +18,44 @@
/*
- * Conversion functions. ToTpmTYPE puts a value of type TYPE into a TPM
- * command buffer. FromTpmTYPE gets a value of type TYPE from a TPM command
+ * Conversion functions. to_tpm_TYPE puts a value of type TYPE into a TPM
+ * command buffer. from_tpm_TYPE gets a value of type TYPE from a TPM command
* buffer into a variable.
*/
__attribute__((unused))
-static inline void ToTpmUint32(uint8_t *buffer, uint32_t x) {
- buffer[0] = (uint8_t)(x >> 24);
- buffer[1] = (uint8_t)((x >> 16) & 0xff);
- buffer[2] = (uint8_t)((x >> 8) & 0xff);
- buffer[3] = (uint8_t)(x & 0xff);
+static inline void to_tpm_uint32(uint8_t *buffer, uint32_t x) {
+ buffer[0] = (uint8_t)(x >> 24);
+ buffer[1] = (uint8_t)((x >> 16) & 0xff);
+ buffer[2] = (uint8_t)((x >> 8) & 0xff);
+ buffer[3] = (uint8_t)(x & 0xff);
}
/*
* See comment for above function.
*/
__attribute__((unused))
-static inline void FromTpmUint32(const uint8_t *buffer, uint32_t *x) {
- *x = ((buffer[0] << 24) |
- (buffer[1] << 16) |
- (buffer[2] << 8) |
- buffer[3]);
+static inline void from_tpm_uint32(const uint8_t *buffer, uint32_t *x) {
+ *x = ((buffer[0] << 24) |
+ (buffer[1] << 16) |
+ (buffer[2] << 8) |
+ buffer[3]);
}
/*
* See comment for above function.
*/
__attribute__((unused))
-static inline void ToTpmUint16(uint8_t *buffer, uint16_t x) {
- buffer[0] = (uint8_t)(x >> 8);
- buffer[1] = (uint8_t)(x & 0xff);
+static inline void to_tpm_uint16(uint8_t *buffer, uint16_t x) {
+ buffer[0] = (uint8_t)(x >> 8);
+ buffer[1] = (uint8_t)(x & 0xff);
}
/*
* See comment for above function.
*/
__attribute__((unused))
-static inline void FromTpmUint16(const uint8_t *buffer, uint16_t *x) {
- *x = (buffer[0] << 8) | buffer[1];
+static inline void from_tpm_uint16(const uint8_t *buffer, uint16_t *x) {
+ *x = (buffer[0] << 8) | buffer[1];
}
#endif /* TPM_LITE_TLCL_INTERNAL_H_ */