GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security/tpm: Move TSS stacks into sub-directory 

Change-Id: I5e20d98665c17d39f3f69772093a062bb905f6f9
Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org>
Reviewed-on: https://review.coreboot.org/22105
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Philipp Deppenwiese 2017-10-18 21:54:24 +02:00 committed by Stefan Reinauer
parent d88fb36e61
commit 86391f1605
8 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/security/tpm/Makefile.inc
View File

@ -1,12 +1,14 @@
verstage-$(CONFIG_TPM) += tcg-1.2/tss.c ## TSS
verstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c
verstage-$(CONFIG_TPM2) += tcg-2.0/tss.c verstage-$(CONFIG_TPM) += tss/tcg-1.2/tss.c
verstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss_marshaling.c
verstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss.c
ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y) ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y)
romstage-$(CONFIG_TPM) += tcg-1.2/tss.c romstage-$(CONFIG_TPM) += tss/tcg-1.2/tss.c
romstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c romstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss_marshaling.c
romstage-$(CONFIG_TPM2) += tcg-2.0/tss.c romstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss.c
endif # CONFIG_VBOOT_SEPARATE_VERSTAGE endif # CONFIG_VBOOT_SEPARATE_VERSTAGE
ramstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c ramstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss_marshaling.c
ramstage-$(CONFIG_TPM2) += tcg-2.0/tss.c ramstage-$(CONFIG_TPM2) += tss/tcg-2.0/tss.c

2
src/security/tpm/tcg-1.2/tss.c → src/security/tpm/tss/tcg-1.2/tss.c
View File

@ -19,9 +19,9 @@
#include <string.h> #include <string.h>
#include <security/tpm/tis.h> #include <security/tpm/tis.h>
#include <vb2_api.h> #include <vb2_api.h>
#include <security/tpm/tss.h>
#include "tss_internal.h" #include "tss_internal.h"
#include "tss_structures.h" #include "tss_structures.h"
#include "../tss.h"
#ifdef FOR_TEST #ifdef FOR_TEST
#include <stdio.h> #include <stdio.h>

0
src/security/tpm/tcg-1.2/tss_internal.h → src/security/tpm/tss/tcg-1.2/tss_internal.h
View File

0
src/security/tpm/tcg-1.2/tss_structures.h → src/security/tpm/tss/tcg-1.2/tss_structures.h
View File

4
src/security/tpm/tcg-2.0/tss.c → src/security/tpm/tss/tcg-2.0/tss.c
View File

@ -9,11 +9,11 @@
#include <endian.h> #include <endian.h>
#include <string.h> #include <string.h>
#include <vb2_api.h> #include <vb2_api.h>
#include <security/tpm/tis.h>
#include <security/tpm/antirollback.h>
#include "tss_structures.h" #include "tss_structures.h"
#include "tss_marshaling.h" #include "tss_marshaling.h"
#include "../tis.h"
#include "../antirollback.h"
/* /*
* This file provides interface between firmware and TPM2 device. The TPM1.2 * This file provides interface between firmware and TPM2 device. The TPM1.2

0
src/security/tpm/tcg-2.0/tss_marshaling.c → src/security/tpm/tss/tcg-2.0/tss_marshaling.c
View File

0
src/security/tpm/tcg-2.0/tss_marshaling.h → src/security/tpm/tss/tcg-2.0/tss_marshaling.h
View File

2
src/security/tpm/tcg-2.0/tss_structures.h → src/security/tpm/tss/tcg-2.0/tss_structures.h
View File

@ -15,7 +15,7 @@
#include <compiler.h> #include <compiler.h>
#include <types.h> #include <types.h>
#include "../tss.h" #include <security/tpm/tss.h>
/* This should be plenty for what firmware needs. */ /* This should be plenty for what firmware needs. */
#define TPM_BUFFER_SIZE 256 #define TPM_BUFFER_SIZE 256