- 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
This commit is contained in:
Damien Miller 2010-03-22 05:55:06 +11:00
parent 8ddc71c13d
commit 1b61a2825e
2 changed files with 8 additions and 4 deletions

View File

@ -23,6 +23,10 @@
[clientloop.c] [clientloop.c]
protocol conformance fix: send language tag when disconnecting normally; protocol conformance fix: send language tag when disconnecting normally;
spotted by 1.41421 AT gmail.com, ok markus@ deraadt@ spotted by 1.41421 AT gmail.com, ok markus@ deraadt@
- 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
20100314 20100314
- (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix

View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keygen.1,v 1.90 2010/03/10 07:40:35 jmc Exp $ .\" $OpenBSD: ssh-keygen.1,v 1.91 2010/03/13 21:45:46 djm Exp $
.\" .\"
.\" -*- nroff -*- .\" -*- nroff -*-
.\" .\"
@ -37,7 +37,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.Dd $Mdocdate: March 10 2010 $ .Dd $Mdocdate: March 13 2010 $
.Dt SSH-KEYGEN 1 .Dt SSH-KEYGEN 1
.Os .Os
.Sh NAME .Sh NAME
@ -518,7 +518,7 @@ To generate a user certificate:
.Dl $ ssh-keygen -s /path/to/ca_key -I key_id /path/to/user_key.pub .Dl $ ssh-keygen -s /path/to/ca_key -I key_id /path/to/user_key.pub
.Pp .Pp
The resultant certificate will be placed in The resultant certificate will be placed in
.Pa /path/to/user_key_cert.pub . .Pa /path/to/user_key-cert.pub .
A host certificate requires the A host certificate requires the
.Fl h .Fl h
option: option:
@ -526,7 +526,7 @@ option:
.Dl $ ssh-keygen -s /path/to/ca_key -I key_id -h /path/to/host_key.pub .Dl $ ssh-keygen -s /path/to/ca_key -I key_id -h /path/to/host_key.pub
.Pp .Pp
The host certificate will be output to The host certificate will be output to
.Pa /path/to/host_key_cert.pub . .Pa /path/to/host_key-cert.pub .
In both cases, In both cases,
.Ar key_id .Ar key_id
is a "key identifier" that is logged by the server when the certificate is a "key identifier" that is logged by the server when the certificate