From f91bcb310bae7478104304bd18c75cdd73a1e229 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Wed, 26 Aug 2020 09:22:45 +0200 Subject: src/security: Drop unneeded empty lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icb6057ac73fcc038981ef95a648420ac00b3c106 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/coreboot/+/44808 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/security/intel/stm/StmPlatformSmm.c | 2 -- src/security/intel/txt/txt_register.h | 1 - src/security/memory/memory.h | 1 - src/security/tpm/tspi.h | 1 - src/security/tpm/tspi/crtm.c | 1 - src/security/tpm/tss/tcg-1.2/tss.c | 2 -- src/security/tpm/tss/tcg-1.2/tss_internal.h | 1 - src/security/tpm/tss/vendor/cr50/cr50.h | 2 -- src/security/vboot/misc.h | 1 - src/security/vboot/tpm_common.c | 1 - src/security/vboot/vboot_logic.c | 1 - 11 files changed, 14 deletions(-) (limited to 'src/security') diff --git a/src/security/intel/stm/StmPlatformSmm.c b/src/security/intel/stm/StmPlatformSmm.c index 9eccb32faa..eb9a0bb22f 100644 --- a/src/security/intel/stm/StmPlatformSmm.c +++ b/src/security/intel/stm/StmPlatformSmm.c @@ -73,7 +73,6 @@ struct descriptor { uintptr_t base; } __attribute__((packed)); - static void read_gdtr(struct descriptor *gdtr) { __asm__ __volatile__("sgdt %0" : "=m"(*gdtr)); @@ -118,7 +117,6 @@ void setup_smm_descriptor(void *smbase, void *base_smbase, int32_t apic_id, psd->smm_other_segment = ROM_DATA_SEG; psd->smm_tr = SMM_TASK_STATE_SEG; - // At this point the coreboot smm_stub is relative to the default // smbase and not the one for the smi handler in tseg. So we have // to adjust the gdtr.base diff --git a/src/security/intel/txt/txt_register.h b/src/security/intel/txt/txt_register.h index 688221f395..c7f1575ce7 100644 --- a/src/security/intel/txt/txt_register.h +++ b/src/security/intel/txt/txt_register.h @@ -267,7 +267,6 @@ struct __packed txt_biosdataregion { u8 extended_data_elements[0]; }; - void txt_dump_regions(void); void txt_dump_chipset_info(void); void txt_dump_acm_info(const struct acm_header_v0 *acm_header); diff --git a/src/security/memory/memory.h b/src/security/memory/memory.h index 442ace1189..c6ae4f8468 100644 --- a/src/security/memory/memory.h +++ b/src/security/memory/memory.h @@ -1,4 +1,3 @@ /* SPDX-License-Identifier: GPL-2.0-only */ - bool security_clear_dram_request(void); diff --git a/src/security/tpm/tspi.h b/src/security/tpm/tspi.h index a776a4db0a..e040d80611 100644 --- a/src/security/tpm/tspi.h +++ b/src/security/tpm/tspi.h @@ -41,7 +41,6 @@ void tcpa_log_add_table_entry(const char *name, const uint32_t pcr, */ void tcpa_log_dump(void *unused); - /** * Ask vboot for a digest and extend a TPM PCR with it. * @param pcr sets the pcr index diff --git a/src/security/tpm/tspi/crtm.c b/src/security/tpm/tspi/crtm.c index f5c788c016..d9c62e1e14 100644 --- a/src/security/tpm/tspi/crtm.c +++ b/src/security/tpm/tspi/crtm.c @@ -165,7 +165,6 @@ int tspi_measure_cache_to_pcr(void) hash_alg = VB2_HASH_SHA256; } - printk(BIOS_DEBUG, "TPM: Write digests cached in TCPA log to PCR\n"); for (i = 0; i < tclt->num_entries; i++) { struct tcpa_entry *tce = &tclt->entries[i]; diff --git a/src/security/tpm/tss/tcg-1.2/tss.c b/src/security/tpm/tss/tcg-1.2/tss.c index 30cd1cc3e9..a3d0235365 100644 --- a/src/security/tpm/tss/tcg-1.2/tss.c +++ b/src/security/tpm/tss/tcg-1.2/tss.c @@ -99,7 +99,6 @@ static uint32_t tlcl_send_receive_no_retry(const uint8_t *request, return result; } - /* Sends a TPM command and gets a response. Returns 0 if success or the TPM * 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, @@ -246,7 +245,6 @@ uint32_t tlcl_read(uint32_t index, void *data, uint32_t length) return result; } - uint32_t tlcl_assert_physical_presence(void) { VBDEBUG("TPM: Asserting physical presence\n"); diff --git a/src/security/tpm/tss/tcg-1.2/tss_internal.h b/src/security/tpm/tss/tcg-1.2/tss_internal.h index 1f49f041f4..c5a5aaa187 100644 --- a/src/security/tpm/tss/tcg-1.2/tss_internal.h +++ b/src/security/tpm/tss/tcg-1.2/tss_internal.h @@ -15,7 +15,6 @@ #define kEncAuthLength 20 #define kPcrDigestLength 20 - /* * 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 diff --git a/src/security/tpm/tss/vendor/cr50/cr50.h b/src/security/tpm/tss/vendor/cr50/cr50.h index dadeddfb68..7730eccd29 100644 --- a/src/security/tpm/tss/vendor/cr50/cr50.h +++ b/src/security/tpm/tss/vendor/cr50/cr50.h @@ -40,7 +40,6 @@ enum cr50_tpm_mode { TPM_MODE_INVALID, }; - /** * CR50 specific tpm command to enable nvmem commits before internal timeout * expires. @@ -96,5 +95,4 @@ uint32_t tlcl_cr50_get_boot_mode(uint8_t *boot_mode); */ uint32_t tlcl_cr50_immediate_reset(uint16_t timeout_ms); - #endif /* CR50_TSS_STRUCTURES_H_ */ diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h index 470102111e..c39af08f1b 100644 --- a/src/security/vboot/misc.h +++ b/src/security/vboot/misc.h @@ -87,5 +87,4 @@ static inline int vboot_logic_executed(void) } } - #endif /* __VBOOT_MISC_H__ */ diff --git a/src/security/vboot/tpm_common.c b/src/security/vboot/tpm_common.c index ca7cedd168..783392c76d 100644 --- a/src/security/vboot/tpm_common.c +++ b/src/security/vboot/tpm_common.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ - #include #include #include diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c index c4c3b4bf37..0f18f9a20f 100644 --- a/src/security/vboot/vboot_logic.c +++ b/src/security/vboot/vboot_logic.c @@ -207,7 +207,6 @@ static vb2_error_t hash_body(struct vb2_context *ctx, return VB2_SUCCESS; } - static uint32_t extend_pcrs(struct vb2_context *ctx) { return vboot_extend_pcr(ctx, 0, BOOT_MODE_PCR) || -- cgit v1.2.3