Skip to content

Commit e08c6d3

Browse files
andy-shevJarkko Sakkinen
authored andcommitted
tpm: use %*ph to print small buffer
Use %*ph format to print small buffer as hex string. Signed-off-by: Andy Shevchenko <[email protected]> Reviewed-by: Petr Vorel <[email protected]> Reviewed-by: Jarkko Sakkinen <[email protected]> Signed-off-by: Jarkko Sakkinen <[email protected]>
1 parent a4c3049 commit e08c6d3

File tree

1 file changed

+10
-21
lines changed

1 file changed

+10
-21
lines changed

drivers/char/tpm/tpm-sysfs.c

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,31 +56,20 @@ static ssize_t pubek_show(struct device *dev, struct device_attribute *attr,
5656
out = (struct tpm_readpubek_out *)&tpm_buf.data[10];
5757
str +=
5858
sprintf(str,
59-
"Algorithm: %02X %02X %02X %02X\n"
60-
"Encscheme: %02X %02X\n"
61-
"Sigscheme: %02X %02X\n"
62-
"Parameters: %02X %02X %02X %02X "
63-
"%02X %02X %02X %02X "
64-
"%02X %02X %02X %02X\n"
59+
"Algorithm: %4ph\n"
60+
"Encscheme: %2ph\n"
61+
"Sigscheme: %2ph\n"
62+
"Parameters: %12ph\n"
6563
"Modulus length: %d\n"
6664
"Modulus:\n",
67-
out->algorithm[0], out->algorithm[1], out->algorithm[2],
68-
out->algorithm[3],
69-
out->encscheme[0], out->encscheme[1],
70-
out->sigscheme[0], out->sigscheme[1],
71-
out->parameters[0], out->parameters[1],
72-
out->parameters[2], out->parameters[3],
73-
out->parameters[4], out->parameters[5],
74-
out->parameters[6], out->parameters[7],
75-
out->parameters[8], out->parameters[9],
76-
out->parameters[10], out->parameters[11],
65+
out->algorithm,
66+
out->encscheme,
67+
out->sigscheme,
68+
out->parameters,
7769
be32_to_cpu(out->keysize));
7870

79-
for (i = 0; i < 256; i++) {
80-
str += sprintf(str, "%02X ", out->modulus[i]);
81-
if ((i + 1) % 16 == 0)
82-
str += sprintf(str, "\n");
83-
}
71+
for (i = 0; i < 256; i += 16)
72+
str += sprintf(str, "%16ph\n", &out->modulus[i]);
8473

8574
out_buf:
8675
tpm_buf_destroy(&tpm_buf);

0 commit comments

Comments
 (0)