diff options
author | naddy@openbsd.org <naddy@openbsd.org> | 2015-08-20 19:20:06 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-08-21 13:43:24 +1000 |
commit | 05291e5288704d1a98bacda269eb5a0153599146 (patch) | |
tree | 72637ec6e47443efa65d5cb1bbd007a73a8e8d1b /ssh-keygen.1 | |
parent | 8543d4ef6f2e9f98c3e6b77c894ceec30c5e4ae4 (diff) |
upstream commit
In the certificates section, be consistent about using
"host_key" and "user_key" for the respective key types. ok sthen@ deraadt@
Upstream-ID: 9e037ea3b15577b238604c5533e082a3947f13cb
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r-- | ssh-keygen.1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 8c3317be7..ed17a08fa 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.126 2015/07/03 03:49:45 djm Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.127 2015/08/20 19:20:06 naddy Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -35,7 +35,7 @@ | |||
35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
37 | .\" | 37 | .\" |
38 | .Dd $Mdocdate: July 3 2015 $ | 38 | .Dd $Mdocdate: August 20 2015 $ |
39 | .Dt SSH-KEYGEN 1 | 39 | .Dt SSH-KEYGEN 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -680,7 +680,7 @@ and identifying the CA key by providing its public half as an argument | |||
680 | to | 680 | to |
681 | .Fl s : | 681 | .Fl s : |
682 | .Pp | 682 | .Pp |
683 | .Dl $ ssh-keygen -s ca_key.pub -D libpkcs11.so -I key_id host_key.pub | 683 | .Dl $ ssh-keygen -s ca_key.pub -D libpkcs11.so -I key_id user_key.pub |
684 | .Pp | 684 | .Pp |
685 | In all cases, | 685 | In all cases, |
686 | .Ar key_id | 686 | .Ar key_id |
@@ -693,7 +693,7 @@ By default, generated certificates are valid for all users or hosts. | |||
693 | To generate a certificate for a specified set of principals: | 693 | To generate a certificate for a specified set of principals: |
694 | .Pp | 694 | .Pp |
695 | .Dl $ ssh-keygen -s ca_key -I key_id -n user1,user2 user_key.pub | 695 | .Dl $ ssh-keygen -s ca_key -I key_id -n user1,user2 user_key.pub |
696 | .Dl "$ ssh-keygen -s ca_key -I key_id -h -n host.domain user_key.pub" | 696 | .Dl "$ ssh-keygen -s ca_key -I key_id -h -n host.domain host_key.pub" |
697 | .Pp | 697 | .Pp |
698 | Additional limitations on the validity and use of user certificates may | 698 | Additional limitations on the validity and use of user certificates may |
699 | be specified through certificate options. | 699 | be specified through certificate options. |