swtpm: Add missing kdf option documentation to help screen

Add missing kdf option documentation to help screen. The kdf
option parameter support has been there since 0.1.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

diff --git a/src/swtpm/cuse_tpm.c b/src/swtpm/cuse_tpm.c
index b5341890d3bf9d75dfcecb25dd850be3f96472c1..702a27785b6ac368a8f07d9cddcef1d8e17afec3 100644 (file)
--- a/src/swtpm/cuse_tpm.c
+++ b/src/swtpm/cuse_tpm.c
@@ -193,9 +193,9 @@ static const char *usage =
 "                       the key is to be provided as a hex string or in binary\n"
 "                       format; the keyfile can be automatically removed using\n"
 "                       the remove parameter\n"
-"--key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]]\n"
+"--key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]][,kdf=sha512|pbkdf2]\n"
 "                    :  provide a passphrase in a file; the AES key will be\n"
-"                       derived from this passphrase\n"
+"                       derived from this passphrase; default kdf is PBKDF2\n"
 "--locality [reject-locality-4][,allow-set-locality]\n"
 "                    :  reject-locality-4: reject any command in locality 4\n"
 "                       allow-set-locality: accept SetLocality command\n"
@@ -204,9 +204,9 @@ static const char *usage =
 "                       when it is retrieved from the TPM via ioctls;\n"
 "                       Setting this key ensures that the TPM's state will always\n"
 "                       be encrypted when migrated\n"
-"--migration-key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]]\n"
+"--migration-key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]][,kdf=sha512|pbkdf2]\n"
 "                    :  provide a passphrase in a file; the AES key will be\n"
-"                       derived from this passphrase\n"
+"                       derived from this passphrase; default kdf is PBKDF2\n"
 "--log file=<path>|fd=<filedescriptor>[,level=n][,prefix=<prefix>][,truncate]\n"
 "                    :  write the TPM's log into the given file rather than\n"
 "                       to the console; provide '-' for path to avoid logging\n"

diff --git a/src/swtpm/swtpm.c b/src/swtpm/swtpm.c
index d4541303afee0aac8be8b33c2ebd2c35a65a1d85..4af36049163733f6d3abc4f5dcb8078437786dde 100644 (file)
--- a/src/swtpm/swtpm.c
+++ b/src/swtpm/swtpm.c
@@ -128,9 +128,9 @@ static void usage(FILE *file, const char *prgname, const char *iface)
     "                   when it is retrieved from the TPM via ioctls;\n"
     "                   Setting this key ensures that the TPM's state will always\n"
     "                   be encrypted when migrated\n"
-    "--migration-key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]]\n"
+    "--migration-key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]][,kdf=sha512|pbkdf2]\n"
     "                 : provide a passphrase in a file; the AES key will be\n"
-    "                   derived from this passphrase\n"
+    "                   derived from this passphrase; default kdf is PBKDF2\n"
     "--log file=<path>|fd=<filedescriptor>[,level=n][,prefix=<prefix>][,truncate]\n"
     "                 : write the TPM's log into the given file rather than\n"
     "                   to the console; provide '-' for path to avoid logging\n"
@@ -143,9 +143,9 @@ static void usage(FILE *file, const char *prgname, const char *iface)
     "                   the key is to be provided as a hex string or in binary\n"
     "                   format; the keyfile can be automatically removed using\n"
     "                   the remove parameter\n"
-    "--key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]]\n"
+    "--key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]][,kdf=sha512|pbkdf2]\n"
     "                 : provide a passphrase in a file; the AES key will be\n"
-    "                   derived from this passphrase\n"
+    "                   derived from this passphrase; default kdf is PBKDF2\n"
     "--locality [reject-locality-4][,allow-set-locality]\n"
     "                 : reject-locality-4: reject any command in locality 4\n"
     "                   allow-set-locality: accept SetLocality command\n"

diff --git a/src/swtpm/swtpm_chardev.c b/src/swtpm/swtpm_chardev.c
index c75a4ab3357fc94b2c740bb099a322c2f588dfa6..0e65facad424c89e8d68e2ceaedf2a6260163441 100644 (file)
--- a/src/swtpm/swtpm_chardev.c
+++ b/src/swtpm/swtpm_chardev.c
@@ -157,9 +157,9 @@ static void usage(FILE *file, const char *prgname, const char *iface)
     "                   when it is retrieved from the TPM via ioctls;\n"
     "                   Setting this key ensures that the TPM's state will always\n"
     "                   be encrypted when migrated\n"
-    "--migration-key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]]\n"
+    "--migration-key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]][,kdf=sha512|pbkdf2]\n"
     "                 : provide a passphrase in a file; the AES key will be\n"
-    "                   derived from this passphrase\n"
+    "                   derived from this passphrase; default kdf is PBKDF2\n"
     "--log file=<path>|fd=<filedescriptor>[,level=n][,prefix=<prefix>][,truncate]\n"
     "                 : write the TPM's log into the given file rather than\n"
     "                   to the console; provide '-' for path to avoid logging\n"
@@ -172,9 +172,9 @@ static void usage(FILE *file, const char *prgname, const char *iface)
     "                   the key is to be provided as a hex string or in binary\n"
     "                   format; the keyfile can be automatically removed using\n"
     "                   the remove parameter\n"
-    "--key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]]\n"
+    "--key pwdfile=<path>[,mode=aes-cbc|aes-256-cbc][,remove=[true|false]][,kdf=sha512|pbkdf2]\n"
     "                 : provide a passphrase in a file; the AES key will be\n"
-    "                   derived from this passphrase\n"
+    "                   derived from this passphrase; default kdf is PBKDF2\n"
     "--pid file=<path>|fd=<filedescriptor>\n"
     "                 : write the process ID into the given file\n"
     "--tpmstate dir=<dir>[,mode=0...]\n"