diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2019-12-27 08:25:07 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-12-30 14:31:40 +1100 |
commit | 5b6c954751dd3677466cda7adb92e4f05446c96c (patch) | |
tree | 0f19536a9e24399c8e14a8f4765a6da7783a6abc | |
parent | 141df487ba699cfd1ec3dcd98186e7c956e99024 (diff) |
upstream: in the options list, sort -Y and -y;
OpenBSD-Commit-ID: 24c2e6a3aeab6e050a0271ffc73fdff91c10dcaa
-rw-r--r-- | ssh-keygen.1 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index e48597388..8d62bc72e 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.180 2019/12/21 20:22:34 naddy Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.181 2019/12/27 08:25:07 jmc 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: December 21 2019 $ | 38 | .Dd $Mdocdate: December 27 2019 $ |
39 | .Dt SSH-KEYGEN 1 | 39 | .Dt SSH-KEYGEN 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -688,9 +688,6 @@ Note that | |||
688 | .Xr sshd 8 | 688 | .Xr sshd 8 |
689 | will refuse such signatures by default, unless overridden via | 689 | will refuse such signatures by default, unless overridden via |
690 | an authorized_keys option. | 690 | an authorized_keys option. |
691 | .It Fl y | ||
692 | This option will read a private | ||
693 | OpenSSH format file and print an OpenSSH public key to stdout. | ||
694 | .It Fl Y Cm sign | 691 | .It Fl Y Cm sign |
695 | Cryptographically sign a file or some data using a SSH key. | 692 | Cryptographically sign a file or some data using a SSH key. |
696 | When signing, | 693 | When signing, |
@@ -763,6 +760,9 @@ flag. | |||
763 | Successful testing of the signature is signalled by | 760 | Successful testing of the signature is signalled by |
764 | .Nm | 761 | .Nm |
765 | returning a zero exit status. | 762 | returning a zero exit status. |
763 | .It Fl y | ||
764 | This option will read a private | ||
765 | OpenSSH format file and print an OpenSSH public key to stdout. | ||
766 | .It Fl z Ar serial_number | 766 | .It Fl z Ar serial_number |
767 | Specifies a serial number to be embedded in the certificate to distinguish | 767 | Specifies a serial number to be embedded in the certificate to distinguish |
768 | this certificate from others from the same CA. | 768 | this certificate from others from the same CA. |