diff options
| author | jmc@openbsd.org <jmc@openbsd.org> | 2019-10-03 17:07:50 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-10-04 13:40:57 +1000 |
| commit | 6918974405cc28ed977f802fd97a9c9a9b2e141b (patch) | |
| tree | ca712dfece5455041ebd85a3b36568b98a07aae6 /ssh-keygen.1 | |
| parent | feff96b7d4c0b99307f0459cbff128aede4a8984 (diff) | |
upstream: use a more common options order in SYNOPSIS and sync
usage(); while here, no need for Bk/Ek;
ok dtucker
OpenBSD-Commit-ID: 38715c3f10b166f599a2283eb7bc14860211bb90
Diffstat (limited to 'ssh-keygen.1')
| -rw-r--r-- | ssh-keygen.1 | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 637dd423..957d2f0f 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.170 2019/09/29 16:31:57 jmc Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.171 2019/10/03 17:07:50 jmc Exp $ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -35,44 +35,43 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: September 29 2019 $ +.Dd $Mdocdate: October 3 2019 $ .Dt SSH-KEYGEN 1 .Os .Sh NAME .Nm ssh-keygen .Nd authentication key generation, management and conversion .Sh SYNOPSIS -.Bk -words .Nm ssh-keygen .Op Fl q .Op Fl b Ar bits -.Op Fl t Cm dsa | ecdsa | ed25519 | rsa -.Op Fl N Ar new_passphrase .Op Fl C Ar comment .Op Fl f Ar output_keyfile .Op Fl m Ar format +.Op Fl N Ar new_passphrase +.Op Fl t Cm dsa | ecdsa | ed25519 | rsa .Nm ssh-keygen .Fl p -.Op Fl P Ar old_passphrase -.Op Fl N Ar new_passphrase .Op Fl f Ar keyfile .Op Fl m Ar format +.Op Fl N Ar new_passphrase +.Op Fl P Ar old_passphrase .Nm ssh-keygen .Fl i -.Op Fl m Ar key_format .Op Fl f Ar input_keyfile +.Op Fl m Ar key_format .Nm ssh-keygen .Fl e -.Op Fl m Ar key_format .Op Fl f Ar input_keyfile +.Op Fl m Ar key_format .Nm ssh-keygen .Fl y .Op Fl f Ar input_keyfile .Nm ssh-keygen .Fl c -.Op Fl P Ar passphrase .Op Fl C Ar comment .Op Fl f Ar keyfile +.Op Fl P Ar passphrase .Nm ssh-keygen .Fl l .Op Fl v @@ -104,8 +103,8 @@ .Op Fl M Ar memory .Op Fl S Ar start_point .Nm ssh-keygen -.Fl T Ar output_file .Fl f Ar input_file +.Fl T Ar output_file .Op Fl v .Op Fl a Ar rounds .Op Fl J Ar num_lines @@ -113,8 +112,8 @@ .Op Fl K Ar checkpt .Op Fl W Ar generator .Nm ssh-keygen -.Fl s Ar ca_key .Fl I Ar certificate_identity +.Fl s Ar ca_key .Op Fl hU .Op Fl D Ar pkcs11_provider .Op Fl n Ar principals @@ -140,22 +139,21 @@ .Fl f Ar krl_file .Ar .Nm ssh-keygen +.Fl Y Cm check-novalidate +.Fl n Ar namespace +.Fl s Ar signature_file +.Nm ssh-keygen .Fl Y Cm sign .Fl f Ar key_file .Fl n Ar namespace .Ar .Nm ssh-keygen .Fl Y Cm verify -.Fl I Ar signer_identity .Fl f Ar allowed_signers_file +.Fl I Ar signer_identity .Fl n Ar namespace .Fl s Ar signature_file .Op Fl r Ar revocation_file -.Nm ssh-keygen -.Fl Y Cm check-novalidate -.Fl s Ar signature_file -.Fl n Ar namespace -.Ek .Sh DESCRIPTION .Nm generates, manages and converts authentication keys for |