mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 08:30:50 +09:00
tpm: align arguments with open parenthesis
Fix following checkpatch.pl issue in TPM-related code: CHECK: Alignment should match open parenthesis Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
b9804e5bf3
commit
c617918764
78
cmd/tpm.c
78
cmd/tpm.c
@ -237,8 +237,8 @@ static int type_string_write_vars(const char *type_str, u8 *data,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_startup(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_startup(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
enum tpm_startup_type mode;
|
enum tpm_startup_type mode;
|
||||||
|
|
||||||
@ -258,8 +258,8 @@ static int do_tpm_startup(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(tpm_startup(mode));
|
return report_return_code(tpm_startup(mode));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_nv_define_space(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_nv_define_space(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 index, perm, size;
|
u32 index, perm, size;
|
||||||
|
|
||||||
@ -272,8 +272,8 @@ static int do_tpm_nv_define_space(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(tpm_nv_define_space(index, perm, size));
|
return report_return_code(tpm_nv_define_space(index, perm, size));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_nv_read_value(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_nv_read_value(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 index, count, rc;
|
u32 index, count, rc;
|
||||||
void *data;
|
void *data;
|
||||||
@ -293,8 +293,8 @@ static int do_tpm_nv_read_value(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(rc);
|
return report_return_code(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_nv_write_value(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_nv_write_value(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 index, rc;
|
u32 index, rc;
|
||||||
size_t count;
|
size_t count;
|
||||||
@ -315,8 +315,8 @@ static int do_tpm_nv_write_value(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(rc);
|
return report_return_code(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_extend(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_extend(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 index, rc;
|
u32 index, rc;
|
||||||
u8 in_digest[20], out_digest[20];
|
u8 in_digest[20], out_digest[20];
|
||||||
@ -338,8 +338,8 @@ static int do_tpm_extend(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(rc);
|
return report_return_code(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_pcr_read(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_pcr_read(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 index, count, rc;
|
u32 index, count, rc;
|
||||||
void *data;
|
void *data;
|
||||||
@ -359,8 +359,8 @@ static int do_tpm_pcr_read(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(rc);
|
return report_return_code(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_tsc_physical_presence(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_tsc_physical_presence(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u16 presence;
|
u16 presence;
|
||||||
|
|
||||||
@ -371,8 +371,8 @@ static int do_tpm_tsc_physical_presence(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(tpm_tsc_physical_presence(presence));
|
return report_return_code(tpm_tsc_physical_presence(presence));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_read_pubek(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_read_pubek(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 count, rc;
|
u32 count, rc;
|
||||||
void *data;
|
void *data;
|
||||||
@ -391,8 +391,8 @@ static int do_tpm_read_pubek(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(rc);
|
return report_return_code(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_physical_set_deactivated(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_physical_set_deactivated(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u8 state;
|
u8 state;
|
||||||
|
|
||||||
@ -403,8 +403,8 @@ static int do_tpm_physical_set_deactivated(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(tpm_physical_set_deactivated(state));
|
return report_return_code(tpm_physical_set_deactivated(state));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_get_capability(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_get_capability(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 cap_area, sub_cap, rc;
|
u32 cap_area, sub_cap, rc;
|
||||||
void *cap;
|
void *cap;
|
||||||
@ -455,8 +455,7 @@ static int get_tpm(struct udevice **devp)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_info(cmd_tbl_t *cmdtp, int flag, int argc,
|
static int do_tpm_info(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
|
||||||
char *const argv[])
|
|
||||||
{
|
{
|
||||||
struct udevice *dev;
|
struct udevice *dev;
|
||||||
char buf[80];
|
char buf[80];
|
||||||
@ -475,8 +474,8 @@ static int do_tpm_info(cmd_tbl_t *cmdtp, int flag, int argc,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_raw_transfer(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_raw_transfer(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
struct udevice *dev;
|
struct udevice *dev;
|
||||||
void *command;
|
void *command;
|
||||||
@ -504,8 +503,8 @@ static int do_tpm_raw_transfer(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(rc);
|
return report_return_code(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_nv_define(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_nv_define(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 index, perm, size;
|
u32 index, perm, size;
|
||||||
|
|
||||||
@ -522,8 +521,8 @@ static int do_tpm_nv_define(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(tpm_nv_define_space(index, perm, size));
|
return report_return_code(tpm_nv_define_space(index, perm, size));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_nv_read(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_nv_read(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 index, count, err;
|
u32 index, count, err;
|
||||||
void *data;
|
void *data;
|
||||||
@ -551,8 +550,8 @@ static int do_tpm_nv_read(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(err);
|
return report_return_code(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_nv_write(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_nv_write(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 index, count, err;
|
u32 index, count, err;
|
||||||
void *data;
|
void *data;
|
||||||
@ -581,8 +580,8 @@ static int do_tpm_nv_write(cmd_tbl_t *cmdtp, int flag,
|
|||||||
|
|
||||||
#ifdef CONFIG_TPM_AUTH_SESSIONS
|
#ifdef CONFIG_TPM_AUTH_SESSIONS
|
||||||
|
|
||||||
static int do_tpm_oiap(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_oiap(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 auth_handle, err;
|
u32 auth_handle, err;
|
||||||
|
|
||||||
@ -630,8 +629,8 @@ static int do_tpm_load_key_by_sha1(cmd_tbl_t *cmdtp, int flag, int argc, char *
|
|||||||
}
|
}
|
||||||
#endif /* CONFIG_TPM_LOAD_KEY_BY_SHA1 */
|
#endif /* CONFIG_TPM_LOAD_KEY_BY_SHA1 */
|
||||||
|
|
||||||
static int do_tpm_load_key2_oiap(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_load_key2_oiap(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 parent_handle, key_len, key_handle, err;
|
u32 parent_handle, key_len, key_handle, err;
|
||||||
u8 usage_auth[DIGEST_LENGTH];
|
u8 usage_auth[DIGEST_LENGTH];
|
||||||
@ -655,8 +654,8 @@ static int do_tpm_load_key2_oiap(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return report_return_code(err);
|
return report_return_code(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int do_tpm_get_pub_key_oiap(cmd_tbl_t *cmdtp, int flag,
|
static int do_tpm_get_pub_key_oiap(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
int argc, char * const argv[])
|
char * const argv[])
|
||||||
{
|
{
|
||||||
u32 key_handle, err;
|
u32 key_handle, err;
|
||||||
u8 usage_auth[DIGEST_LENGTH];
|
u8 usage_auth[DIGEST_LENGTH];
|
||||||
@ -671,8 +670,8 @@ static int do_tpm_get_pub_key_oiap(cmd_tbl_t *cmdtp, int flag,
|
|||||||
return CMD_RET_FAILURE;
|
return CMD_RET_FAILURE;
|
||||||
parse_byte_string(argv[2], usage_auth, NULL);
|
parse_byte_string(argv[2], usage_auth, NULL);
|
||||||
|
|
||||||
err = tpm_get_pub_key_oiap(key_handle, usage_auth,
|
err = tpm_get_pub_key_oiap(key_handle, usage_auth, pub_key_buffer,
|
||||||
pub_key_buffer, &pub_key_len);
|
&pub_key_len);
|
||||||
if (!err) {
|
if (!err) {
|
||||||
printf("dump of received pub key structure:\n");
|
printf("dump of received pub key structure:\n");
|
||||||
print_byte_string(pub_key_buffer, pub_key_len);
|
print_byte_string(pub_key_buffer, pub_key_len);
|
||||||
@ -818,8 +817,7 @@ static int do_tpm_list(cmd_tbl_t *cmdtp, int flag, int argc,
|
|||||||
|
|
||||||
static cmd_tbl_t tpm_commands[] = {
|
static cmd_tbl_t tpm_commands[] = {
|
||||||
U_BOOT_CMD_MKENT(info, 0, 1, do_tpm_info, "", ""),
|
U_BOOT_CMD_MKENT(info, 0, 1, do_tpm_info, "", ""),
|
||||||
U_BOOT_CMD_MKENT(init, 0, 1,
|
U_BOOT_CMD_MKENT(init, 0, 1, do_tpm_init, "", ""),
|
||||||
do_tpm_init, "", ""),
|
|
||||||
U_BOOT_CMD_MKENT(startup, 0, 1,
|
U_BOOT_CMD_MKENT(startup, 0, 1,
|
||||||
do_tpm_startup, "", ""),
|
do_tpm_startup, "", ""),
|
||||||
U_BOOT_CMD_MKENT(self_test_full, 0, 1,
|
U_BOOT_CMD_MKENT(self_test_full, 0, 1,
|
||||||
|
@ -928,7 +928,8 @@ u32 tpm_load_key2_oiap(u32 parent_handle, const void *key, size_t key_length,
|
|||||||
err = verify_response_auth(0x00000041, response,
|
err = verify_response_auth(0x00000041, response,
|
||||||
response_length - TPM_RESPONSE_AUTH_LENGTH,
|
response_length - TPM_RESPONSE_AUTH_LENGTH,
|
||||||
4, &oiap_session,
|
4, &oiap_session,
|
||||||
response + response_length - TPM_RESPONSE_AUTH_LENGTH,
|
response + response_length -
|
||||||
|
TPM_RESPONSE_AUTH_LENGTH,
|
||||||
parent_key_usage_auth);
|
parent_key_usage_auth);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
@ -986,7 +987,8 @@ u32 tpm_get_pub_key_oiap(u32 key_handle, const void *usage_auth, void *pubkey,
|
|||||||
err = verify_response_auth(0x00000021, response,
|
err = verify_response_auth(0x00000021, response,
|
||||||
response_length - TPM_RESPONSE_AUTH_LENGTH,
|
response_length - TPM_RESPONSE_AUTH_LENGTH,
|
||||||
0, &oiap_session,
|
0, &oiap_session,
|
||||||
response + response_length - TPM_RESPONSE_AUTH_LENGTH,
|
response + response_length -
|
||||||
|
TPM_RESPONSE_AUTH_LENGTH,
|
||||||
usage_auth);
|
usage_auth);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
Loading…
Reference in New Issue
Block a user