diff options
| author | Kai Engert <kaie@kuix.de> | 2018-02-13 12:23:42 +0100 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2018-02-13 12:23:42 +0100 |
| commit | 4665b4574c367611ea701e2f20fd0bcf381e25b9 (patch) | |
| tree | ff5797bce4cbb77b0fa1acd234daa4bd0bf7fd7c | |
| parent | 668dba9071b713c00828b4d84bbd1d46b159b5ba (diff) | |
| download | nss-hg-4665b4574c367611ea701e2f20fd0bcf381e25b9.tar.gz | |
Bug 1429393, Clarify certutil docs/help that -F deletes both cert and key, not just the key, r=rrelyea
| -rw-r--r-- | cmd/certutil/certutil.c | 2 | ||||
| -rw-r--r-- | doc/certutil.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/certutil/certutil.c b/cmd/certutil/certutil.c index 03f4478b7..20722ae78 100644 --- a/cmd/certutil/certutil.c +++ b/cmd/certutil/certutil.c @@ -1371,7 +1371,7 @@ luF(enum usage_level ul, const char *command) { int is_my_command = (command && 0 == strcmp(command, "F")); if (ul == usage_all || !command || is_my_command) - FPS "%-15s Delete a key from the database\n", + FPS "%-15s Delete a key and associated certificate from the database\n", "-F"); if (ul == usage_selected && !is_my_command) return; diff --git a/doc/certutil.xml b/doc/certutil.xml index d5062bd5e..4622c75e4 100644 --- a/doc/certutil.xml +++ b/doc/certutil.xml @@ -84,11 +84,11 @@ <varlistentry> <term>-F</term> - <listitem><para>Delete a private key from a key database. Specify the key to delete with the -n argument. Specify the database from which to delete the key with the -<option>-d</option> argument. Use the <option>-k</option> argument to specify explicitly whether to delete a DSA, RSA, or ECC key. If you don't use the <option>-k</option> argument, the option looks for an RSA key matching the specified nickname. + <listitem><para>Delete a private key and the associated certificate from a database. Specify the key to delete with the -n argument. Specify the database from which to delete the key with the +<option>-d</option> argument. </para> <para> -When you delete keys, be sure to also remove any certificates associated with those keys from the certificate database, by using -D. Some smart cards do not let you remove a public key you have generated. In such a case, only the private key is deleted from the key pair. You can display the public key with the command certutil -K -h tokenname. </para></listitem> +Some smart cards do not let you remove a public key you have generated. In such a case, only the private key is deleted from the key pair.</para></listitem> </varlistentry> <varlistentry> |