diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-01-06 15:14:54 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-01-06 15:14:54 +0100 |
| commit | cc6a935ce54b573c1efd7533aff00e7bf0a9959c (patch) | |
| tree | c8ad266edb7ea1e7b93aaaaa98847cf662373668 /security/nss/doc/nroff/pk12util.1 | |
| parent | d129c900c9f943adb69c1fb20ba1a029fdd95cff (diff) | |
| parent | 9f4afc2552a67cc675b8b8af2ecb8ebc04a473a7 (diff) | |
| download | UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar.gz UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar.lz UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar.xz UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/components/feeds/FeedWriter.js
# application/palemoon/config/version.txt
# security/manager/ssl/nsSTSPreloadList.errors
# security/manager/ssl/nsSTSPreloadList.inc
Diffstat (limited to 'security/nss/doc/nroff/pk12util.1')
| -rw-r--r-- | security/nss/doc/nroff/pk12util.1 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/nss/doc/nroff/pk12util.1 b/security/nss/doc/nroff/pk12util.1 index e0a8da833..eae5d3616 100644 --- a/security/nss/doc/nroff/pk12util.1 +++ b/security/nss/doc/nroff/pk12util.1 @@ -2,12 +2,12 @@ .\" Title: PK12UTIL .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 27 October 2017 +.\" Date: 5 October 2017 .\" Manual: NSS Security Tools .\" Source: nss-tools .\" Language: English .\" -.TH "PK12UTIL" "1" "27 October 2017" "nss-tools" "NSS Security Tools" +.TH "PK12UTIL" "1" "5 October 2017" "nss-tools" "NSS Security Tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -113,6 +113,8 @@ Specify the desired length of the symmetric key to be used to encrypt the certif \-n certname .RS 4 Specify the nickname of the cert and private key to export\&. +.sp +The nickname can also be a PKCS #11 URI\&. For example, if you have a certificate named "my\-server\-cert" on the internal certificate store, it can be unambiguously specified as "pkcs11:token=NSS%20Certificate%20DB;object=my\-server\-cert"\&. For details about the format, see RFC 7512\&. .RE .PP \-P prefix |