summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-22 05:55:06 +1100
committerDamien Miller <djm@mindrot.org>2010-03-22 05:55:06 +1100
commit1b61a2825e20e6d412aeed7ce16d888835e3398a (patch)
tree05deb44d24ffce3553e05d49822f2dd8da3586b9
parent8ddc71c13d3aac3f7eb13b67dc703b5508eae732 (diff)
- djm@cvs.openbsd.org 2010/03/13 21:45:46
[ssh-keygen.1] Certificates are named *-cert.pub, not *_cert.pub; committing a diff from stevesk@ ok me
-rw-r--r--ChangeLog4
-rw-r--r--ssh-keygen.18
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3dc718056..4df02fbb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,10 @@
23 [clientloop.c] 23 [clientloop.c]
24 protocol conformance fix: send language tag when disconnecting normally; 24 protocol conformance fix: send language tag when disconnecting normally;
25 spotted by 1.41421 AT gmail.com, ok markus@ deraadt@ 25 spotted by 1.41421 AT gmail.com, ok markus@ deraadt@
26 - djm@cvs.openbsd.org 2010/03/13 21:45:46
27 [ssh-keygen.1]
28 Certificates are named *-cert.pub, not *_cert.pub; committing a diff
29 from stevesk@ ok me
26 30
2720100314 3120100314
28 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix 32 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index e79246b79..1ee0835f3 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.90 2010/03/10 07:40:35 jmc Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.91 2010/03/13 21:45:46 djm Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -37,7 +37,7 @@
37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39.\" 39.\"
40.Dd $Mdocdate: March 10 2010 $ 40.Dd $Mdocdate: March 13 2010 $
41.Dt SSH-KEYGEN 1 41.Dt SSH-KEYGEN 1
42.Os 42.Os
43.Sh NAME 43.Sh NAME
@@ -518,7 +518,7 @@ To generate a user certificate:
518.Dl $ ssh-keygen -s /path/to/ca_key -I key_id /path/to/user_key.pub 518.Dl $ ssh-keygen -s /path/to/ca_key -I key_id /path/to/user_key.pub
519.Pp 519.Pp
520The resultant certificate will be placed in 520The resultant certificate will be placed in
521.Pa /path/to/user_key_cert.pub . 521.Pa /path/to/user_key-cert.pub .
522A host certificate requires the 522A host certificate requires the
523.Fl h 523.Fl h
524option: 524option:
@@ -526,7 +526,7 @@ option:
526.Dl $ ssh-keygen -s /path/to/ca_key -I key_id -h /path/to/host_key.pub 526.Dl $ ssh-keygen -s /path/to/ca_key -I key_id -h /path/to/host_key.pub
527.Pp 527.Pp
528The host certificate will be output to 528The host certificate will be output to
529.Pa /path/to/host_key_cert.pub . 529.Pa /path/to/host_key-cert.pub .
530In both cases, 530In both cases,
531.Ar key_id 531.Ar key_id
532is a "key identifier" that is logged by the server when the certificate 532is a "key identifier" that is logged by the server when the certificate