summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Engert <kaie@kuix.de>2016-09-08 12:51:52 +0200
committerKai Engert <kaie@kuix.de>2016-09-08 12:51:52 +0200
commit114d1c7caaccb371fbaf8cfc54c15f6efadbe8f0 (patch)
tree91a4d0dab8833a8871843182dfb4b21a05934cd5
parent670ccdc5ba3e4ee6205db83aeb8c4f8fd0301c89 (diff)
downloadnss-hg-114d1c7caaccb371fbaf8cfc54c15f6efadbe8f0.tar.gz
bug 1301071, Fix mistake in certutil docs: C and T trust flags are mixed up, r=rrelyeaNSS_3_27_BETA3
Diffstat
-rw-r--r--doc/certutil.xml4
-rw-r--r--doc/html/certutil.html6
-rw-r--r--doc/nroff/certutil.18
3 files changed, 9 insertions, 9 deletions
diff --git a/doc/certutil.xml b/doc/certutil.xml
index 95d68cff5..08a952feb 100644
--- a/doc/certutil.xml
+++ b/doc/certutil.xml
@@ -373,12 +373,12 @@ of the attribute codes:
</listitem>
<listitem>
<para>
- <command>T</command> - Trusted CA (implies c)
+ <command>C</command> - Trusted CA (implies c)
</para>
</listitem>
<listitem>
<para>
- <command>C</command> - trusted CA for client authentication (ssl server only)
+ <command>T</command> - trusted CA for client authentication (ssl server only)
</para>
</listitem>
<listitem>
diff --git a/doc/html/certutil.html b/doc/html/certutil.html
index c3fd59f8b..7c4b5e6c5 100644
--- a/doc/html/certutil.html
+++ b/doc/html/certutil.html
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>CERTUTIL</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"><link rel="home" href="index.html" title="CERTUTIL"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">CERTUTIL</th></tr></table><hr></div><div class="refentry"><a name="certutil"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>certutil — Manage keys and certificate in both NSS databases and other NSS tokens</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">certutil</code> [<em class="replaceable"><code>options</code></em>] [[<em class="replaceable"><code>arguments</code></em>]]</p></div></div><div class="refsection"><a name="idm139984205904704"></a><h2>STATUS</h2><p>This documentation is still work in progress. Please contribute to the initial review in <a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=836477" target="_top">Mozilla NSS bug 836477</a>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>CERTUTIL</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"><link rel="home" href="index.html" title="CERTUTIL"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">CERTUTIL</th></tr></table><hr></div><div class="refentry"><a name="certutil"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>certutil — Manage keys and certificate in both NSS databases and other NSS tokens</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">certutil</code> [<em class="replaceable"><code>options</code></em>] [[<em class="replaceable"><code>arguments</code></em>]]</p></div></div><div class="refsection"><a name="idm139861295402064"></a><h2>STATUS</h2><p>This documentation is still work in progress. Please contribute to the initial review in <a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=836477" target="_top">Mozilla NSS bug 836477</a>
</p></div><div class="refsection"><a name="description"></a><h2>Description</h2><p>The Certificate Database Tool, <span class="command"><strong>certutil</strong></span>, is a command-line utility that can create and modify certificate and key databases. It can specifically list, generate, modify, or delete certificates, create or change the password, generate new public and private key pairs, display the contents of the key database, or delete key pairs within the key database.</p><p>Certificate issuance, part of the key and certificate management process, requires that keys and certificates be created in the key database. This document discusses certificate and key database management. For information on the security module database management, see the <span class="command"><strong>modutil</strong></span> manpage.</p></div><div class="refsection"><a name="options"></a><h2>Command Options and Arguments</h2><p>Running <span class="command"><strong>certutil</strong></span> always requires one and only one command option to specify the type of certificate operation. Each command option may take zero or more arguments. The command option <code class="option">-H</code> will list all the command options and their relevant arguments.</p><p><span class="command"><strong>Command Options</strong></span></p><div class="variablelist"><dl class="variablelist"><dt><span class="term">-A </span></dt><dd><p>Add an existing certificate to a certificate database. The certificate database should already exist; if one is not present, this command option will initialize one by default.</p></dd><dt><span class="term">-B</span></dt><dd><p>Run a series of commands from the specified batch file. This requires the <code class="option">-i</code> argument.</p></dd><dt><span class="term">-C </span></dt><dd><p>Create a new binary certificate file from a binary certificate request file. Use the <code class="option">-i</code> argument to specify the certificate request file. If this argument is not used, <span class="command"><strong>certutil</strong></span> prompts for a filename. </p></dd><dt><span class="term">-D </span></dt><dd><p>Delete a certificate from the certificate database.</p></dd><dt><span class="term">--rename </span></dt><dd><p>Change the database nickname of a certificate.</p></dd><dt><span class="term">-E </span></dt><dd><p>Add an email certificate to the certificate database.</p></dd><dt><span class="term">-F</span></dt><dd><p>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
<code class="option">-d</code> argument. Use the <code class="option">-k</code> argument to specify explicitly whether to delete a DSA, RSA, or ECC key. If you don't use the <code class="option">-k</code> argument, the option looks for an RSA key matching the specified nickname.
</p><p>
@@ -48,9 +48,9 @@ of the attribute codes:
</p></li><li class="listitem"><p>
<span class="command"><strong>c</strong></span> - Valid CA
</p></li><li class="listitem"><p>
- <span class="command"><strong>T</strong></span> - Trusted CA (implies c)
+ <span class="command"><strong>C</strong></span> - Trusted CA (implies c)
</p></li><li class="listitem"><p>
- <span class="command"><strong>C</strong></span> - trusted CA for client authentication (ssl server only)
+ <span class="command"><strong>T</strong></span> - trusted CA for client authentication (ssl server only)
</p></li><li class="listitem"><p>
<span class="command"><strong>u</strong></span> - user
</p></li></ul></div><p>
diff --git a/doc/nroff/certutil.1 b/doc/nroff/certutil.1
index a7daa9364..1f75f978e 100644
--- a/doc/nroff/certutil.1
+++ b/doc/nroff/certutil.1
@@ -2,12 +2,12 @@
.\" Title: CERTUTIL
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 13 August 2015
+.\" Date: 7 September 2016
.\" Manual: NSS Security Tools
.\" Source: nss-tools
.\" Language: English
.\"
-.TH "CERTUTIL" "1" "13 August 2015" "nss-tools" "NSS Security Tools"
+.TH "CERTUTIL" "1" "7 September 2016" "nss-tools" "NSS Security Tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -436,7 +436,7 @@ for each trust setting\&. In each category position, use none, any, or all of th
.sp -1
.IP \(bu 2.3
.\}
-\fBT\fR
+\fBC\fR
\- Trusted CA (implies c)
.RE
.sp
@@ -448,7 +448,7 @@ for each trust setting\&. In each category position, use none, any, or all of th
.sp -1
.IP \(bu 2.3
.\}
-\fBC\fR
+\fBT\fR
\- trusted CA for client authentication (ssl server only)
.RE
.sp
View Lorry Controller Status