diff options
author | Colin Watson <cjwatson@debian.org> | 2015-08-22 10:59:58 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-08-22 10:59:58 +0100 |
commit | 651211fd4a199b299540c00c54a46e27fadb04be (patch) | |
tree | 26dbf99c8861a7f94d0c00be71b38869728ebd81 /ssh-keygen.0 | |
parent | 58ddb8ad21f21f5358db0204c4ba9abf94a1ca11 (diff) | |
parent | e91346dc2bbf460246df2ab591b7613908c1b0ad (diff) |
Import openssh_7.1p1.orig.tar.gz
Diffstat (limited to 'ssh-keygen.0')
-rw-r--r-- | ssh-keygen.0 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-keygen.0 b/ssh-keygen.0 index a471a4055..07a45b36b 100644 --- a/ssh-keygen.0 +++ b/ssh-keygen.0 | |||
@@ -426,7 +426,7 @@ CERTIFICATES | |||
426 | providing the token library using -D and identifying the CA key by | 426 | providing the token library using -D and identifying the CA key by |
427 | providing its public half as an argument to -s: | 427 | providing its public half as an argument to -s: |
428 | 428 | ||
429 | $ ssh-keygen -s ca_key.pub -D libpkcs11.so -I key_id host_key.pub | 429 | $ ssh-keygen -s ca_key.pub -D libpkcs11.so -I key_id user_key.pub |
430 | 430 | ||
431 | In all cases, key_id is a "key identifier" that is logged by the server | 431 | In all cases, key_id is a "key identifier" that is logged by the server |
432 | when the certificate is used for authentication. | 432 | when the certificate is used for authentication. |
@@ -437,7 +437,7 @@ CERTIFICATES | |||
437 | principals: | 437 | principals: |
438 | 438 | ||
439 | $ ssh-keygen -s ca_key -I key_id -n user1,user2 user_key.pub | 439 | $ ssh-keygen -s ca_key -I key_id -n user1,user2 user_key.pub |
440 | $ ssh-keygen -s ca_key -I key_id -h -n host.domain user_key.pub | 440 | $ ssh-keygen -s ca_key -I key_id -h -n host.domain host_key.pub |
441 | 441 | ||
442 | Additional limitations on the validity and use of user certificates may | 442 | Additional limitations on the validity and use of user certificates may |
443 | be specified through certificate options. A certificate option may | 443 | be specified through certificate options. A certificate option may |
@@ -563,4 +563,4 @@ AUTHORS | |||
563 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 563 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
564 | versions 1.5 and 2.0. | 564 | versions 1.5 and 2.0. |
565 | 565 | ||
566 | OpenBSD 5.8 July 3, 2015 OpenBSD 5.8 | 566 | OpenBSD 5.8 August 20, 2015 OpenBSD 5.8 |