]> www.infradead.org Git - users/willy/linux.git/commitdiff
tpm: use %*ph to print small buffer
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 30 Jul 2020 16:16:13 +0000 (19:16 +0300)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 1 Oct 2020 21:21:03 +0000 (00:21 +0300)
Use %*ph format to print small buffer as hex string.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
drivers/char/tpm/tpm-sysfs.c

index d52bf4df0bca96d83a1233f4b3f870c3365805a2..e2ff0b273a0f1de9533a892e175e498d308414d9 100644 (file)
@@ -56,31 +56,20 @@ static ssize_t pubek_show(struct device *dev, struct device_attribute *attr,
        out = (struct tpm_readpubek_out *)&tpm_buf.data[10];
        str +=
            sprintf(str,
-                   "Algorithm: %02X %02X %02X %02X\n"
-                   "Encscheme: %02X %02X\n"
-                   "Sigscheme: %02X %02X\n"
-                   "Parameters: %02X %02X %02X %02X "
-                   "%02X %02X %02X %02X "
-                   "%02X %02X %02X %02X\n"
+                   "Algorithm: %4ph\n"
+                   "Encscheme: %2ph\n"
+                   "Sigscheme: %2ph\n"
+                   "Parameters: %12ph\n"
                    "Modulus length: %d\n"
                    "Modulus:\n",
-                   out->algorithm[0], out->algorithm[1], out->algorithm[2],
-                   out->algorithm[3],
-                   out->encscheme[0], out->encscheme[1],
-                   out->sigscheme[0], out->sigscheme[1],
-                   out->parameters[0], out->parameters[1],
-                   out->parameters[2], out->parameters[3],
-                   out->parameters[4], out->parameters[5],
-                   out->parameters[6], out->parameters[7],
-                   out->parameters[8], out->parameters[9],
-                   out->parameters[10], out->parameters[11],
+                   out->algorithm,
+                   out->encscheme,
+                   out->sigscheme,
+                   out->parameters,
                    be32_to_cpu(out->keysize));
 
-       for (i = 0; i < 256; i++) {
-               str += sprintf(str, "%02X ", out->modulus[i]);
-               if ((i + 1) % 16 == 0)
-                       str += sprintf(str, "\n");
-       }
+       for (i = 0; i < 256; i += 16)
+               str += sprintf(str, "%16ph\n", &out->modulus[i]);
 
 out_buf:
        tpm_buf_destroy(&tpm_buf);