2 files changed, 88 insertions, 0 deletions

diff --git a/firmware/lib/tpm2_lite/marshaling.c b/firmware/lib/tpm2_lite/marshaling.c
index 2517b458..ea261d3c 100644
--- a/firmware/lib/tpm2_lite/marshaling.c
+++ b/firmware/lib/tpm2_lite/marshaling.c
@@ -121,6 +121,26 @@ static void unmarshal_TPM2B_MAX_NV_BUFFER(void **buffer,
 	*size -= nv_buffer->t.size;
 }
 
+static void unmarshal_TPM2B_PUBLIC(void **buffer, int *size,
+				   TPM2B_PUBLIC *pub_buffer)
+{
+	pub_buffer->t.size = unmarshal_u16(buffer, size);
+	if (pub_buffer->t.size > *size) {
+		VB2_DEBUG("size mismatch: expected %d, remaining %d\n",
+			  pub_buffer->t.size, *size);
+		pub_buffer->t.buffer = NULL;
+		pub_buffer->t.size = 0;
+		*buffer = NULL;
+		*size = -1;
+		return;
+	}
+
+	pub_buffer->t.buffer = *buffer;
+
+	*buffer = ((uint8_t *)(*buffer)) + pub_buffer->t.size;
+	*size -= pub_buffer->t.size;
+}
+
 static void unmarshal_authorization_section(void **buffer, int *size,
 					    const char *cmd_name)
 {
@@ -156,6 +176,19 @@ static void unmarshal_nv_read(void **buffer, int *size,
 	unmarshal_authorization_section(buffer, size, "NV_Read");
 }
 
+static void unmarshal_read_public(void **buffer, int *size,
+				  struct read_public_response *rpr)
+{
+	unmarshal_TPM2B_PUBLIC(buffer, size, &rpr->buffer);
+
+	if (*size < 0)
+		return;
+
+	/* Drain the name & authorization sections. */
+	*buffer = ((uint8_t *)(*buffer)) + *size;
+	*size = 0;
+}
+
 static void unmarshal_TPM2B(void **buffer,
 			    int *size,
 			    TPM2B *tpm2b)
@@ -611,6 +644,13 @@ static void marshal_hierarchy_control(void **buffer,
 	marshal_u8(buffer, command_body->state, buffer_space);
 }
 
+static void marshal_read_public(void **buffer,
+				struct tpm2_read_public_cmd *command_body,
+				int *buffer_space)
+{
+	marshal_u32(buffer, command_body->object_handle, buffer_space);
+}
+
 static void marshal_get_capability(void **buffer,
 				   struct tpm2_get_capability_cmd
 				       *command_body,
@@ -787,6 +827,10 @@ int tpm_marshal_command(TPM_CC command, void *tpm_command_body,
 		marshal_pcr_extend(&cmd_body, tpm_command_body, &body_size);
 		break;
 
+	case TPM2_ReadPublic:
+		marshal_read_public(&cmd_body, tpm_command_body, &body_size);
+		break;
+
 	default:
 		body_size = -1;
 		VB2_DEBUG("Request to marshal unsupported command %#x\n",
@@ -848,6 +892,11 @@ int tpm_unmarshal_response(TPM_CC command,
 				     &response->random);
 		break;
 
+	case TPM2_ReadPublic:
+		unmarshal_read_public(&response_body, &cr_size,
+				      &response->read_pub);
+		break;
+
 	case TPM2_Hierarchy_Control:
 	case TPM2_NV_Write:
 	case TPM2_NV_WriteLock:
diff --git a/firmware/lib/tpm2_lite/tlcl.c b/firmware/lib/tpm2_lite/tlcl.c
index 954717fe..156c6199 100644
--- a/firmware/lib/tpm2_lite/tlcl.c
+++ b/firmware/lib/tpm2_lite/tlcl.c
@@ -688,3 +688,42 @@ uint32_t TlclIFXFieldUpgradeInfo(TPM_IFX_FIELDUPGRADEINFO* info)
 	VB2_DEBUG("NOT YET IMPLEMENTED\n");
 	return TPM_E_IOERROR;
 }
+
+uint32_t TlclReadPublic(uint32_t handle, uint8_t *data, uint32_t *length)
+{
+	struct tpm2_read_public_cmd cmd;
+	struct tpm2_response *response = &tpm2_resp;
+	uint32_t rv;
+
+	memset(&cmd, 0, sizeof(cmd));
+
+	cmd.object_handle = handle;
+
+	rv = tpm_send_receive(TPM2_ReadPublic, &cmd, response);
+
+	/* Need to map tpm error codes into internal values. */
+	switch (rv) {
+	case TPM_SUCCESS:
+		break;
+
+	case 0x8b:
+	case 0x18b:
+		return TPM_E_BADINDEX;
+
+	default:
+		return rv;
+	}
+
+	if (*length < response->read_pub.buffer.t.size + 2)
+		return TPM_E_RESPONSE_TOO_LARGE;
+
+	*length = response->read_pub.buffer.t.size + 2;
+
+	data[0] = (response->read_pub.buffer.t.size >> 8) & 0xff;
+	data[1] = response->read_pub.buffer.t.size & 0xff;
+
+	memcpy(data + 2, response->read_pub.buffer.t.buffer,
+	       response->read_pub.buffer.t.size);
+
+	return TPM_SUCCESS;
+}