diff --git a/man/man8/swtpm.pod b/man/man8/swtpm.pod index 6191832c5..a501b43e4 100644 --- a/man/man8/swtpm.pod +++ b/man/man8/swtpm.pod @@ -351,7 +351,8 @@ may contain the following: "cmdarg-print-profiles", "profile-opt-remove-disabled", "cmdarg-print-info", - "tpmstate-opt-lock" + "tpmstate-opt-lock", + "flags-opt-recreate-svn-base-secret" ], "version": "0.7.0" } @@ -448,6 +449,10 @@ The option I<--print-info> is supported. The option parameter I for the I<--tpmstate> option is supported. +=item B (since v0.10) + +The I<--flags> option supports the I flag. + =back =item B<--print-states> (since v0.7) diff --git a/src/swtpm/capabilities.c b/src/swtpm/capabilities.c index c3f94b38d..3882f1f08 100644 --- a/src/swtpm/capabilities.c +++ b/src/swtpm/capabilities.c @@ -271,7 +271,7 @@ int capabilities_print_json(bool cusetpm, TPMLIB_TPMVersion tpmversion) "{ " "\"type\": \"swtpm\", " "\"features\": [ " - "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s" + "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s" " ], " "\"profiles\": { %s}, " "\"version\": \"" VERSION "\" " @@ -296,6 +296,7 @@ int capabilities_print_json(bool cusetpm, TPMLIB_TPMVersion tpmversion) is_tpm2 ? ", \"profile-opt-remove-disabled\"" : "", true ? ", \"cmdarg-print-info\"" : "", true ? ", \"tpmstate-opt-lock\"" : "", + is_tpm2 ? ", \"flags-opt-recreate-svn-base-secret\"" : "", profiles ? profiles : "" ); diff --git a/tests/_test_tpm2_print_capabilities b/tests/_test_tpm2_print_capabilities index bb8ddc2cc..a8e206ba0 100755 --- a/tests/_test_tpm2_print_capabilities +++ b/tests/_test_tpm2_print_capabilities @@ -32,7 +32,7 @@ exp='\{ "type": "swtpm", '\ '"nvram-backend-dir", "nvram-backend-file"'\ '(, "rsa-keysize-1024")?(, "rsa-keysize-2048")?(, "rsa-keysize-3072")?, "cmdarg-profile", '\ '"cmdarg-print-profiles", "profile-opt-remove-disabled", "cmdarg-print-info", '\ -'"tpmstate-opt-lock" \], '\ +'"tpmstate-opt-lock", "flags-opt-recreate-svn-base-secret" \], '\ '"profiles": \{ "names": \[ [^]]*\], "algorithms": \{ [^\}]*\}, "commands": \{ [^\}]*\} }, '\ '"version": "[^"]*" \}' if ! [[ ${msg} =~ ${exp} ]]; then