tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: sync ssh-keygen.1 and ssh-keygen's usage() with each 

other and reality ok markus@

OpenBSD-Commit-ID: cdf64454f2c3604c25977c944e5b6262a3bcce92
This commit is contained in:
naddy@openbsd.org 2020-01-14 15:07:30 +00:00 committed by Damien Miller
parent b8a4ca2ebf
commit 0d005d6372
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ssh-keygen.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keygen.1,v 1.190 2020/01/06 07:43:28 jmc Exp $
.\" $OpenBSD: ssh-keygen.1,v 1.191 2020/01/14 15:07:30 naddy Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -35,7 +35,7 @@
.\" (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: January 6 2020 $
.Dd $Mdocdate: January 14 2020 $
.Dt SSH-KEYGEN 1
.Os
.Sh NAME
@ -48,9 +48,9 @@
.Op Fl C Ar comment
.Op Fl f Ar output_keyfile
.Op Fl m Ar format
.Op Fl O Ar option
.Op Fl t Cm dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa
.Op Fl N Ar new_passphrase
.Op Fl O Ar option
.Op Fl w Ar provider
.Nm ssh-keygen
.Fl p
@ -104,12 +104,12 @@
.Nm ssh-keygen
.Fl M Cm generate
.Op Fl O Ar option
.Ar
.Ar output_file
.Nm ssh-keygen
.Fl M Cm screen
.Fl f Ar input_file
.Op Fl f Ar input_file
.Op Fl O Ar option
.Ar
.Ar output_file
.Nm ssh-keygen
.Fl I Ar certificate_identity
.Fl s Ar ca_key

11
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.382 2020/01/06 02:00:46 djm Exp $ */
/* $OpenBSD: ssh-keygen.c,v 1.383 2020/01/14 15:07:30 naddy Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -3009,7 +3009,7 @@ usage(void)
fprintf(stderr,
"usage: ssh-keygen [-q] [-b bits] [-C comment] [-f output_keyfile] [-m format]\n"
" [-t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa]\n"
" [-N new_passphrase] [-w provider] [-x flags]\n"
" [-N new_passphrase] [-O option] [-w provider]\n"
" ssh-keygen -p [-f keyfile] [-m format] [-N new_passphrase]\n"
" [-P old_passphrase]\n"
" ssh-keygen -i [-f input_keyfile] [-m key_format]\n"
@ -3022,16 +3022,15 @@ usage(void)
fprintf(stderr,
" ssh-keygen -D pkcs11\n");
#endif
fprintf(stderr,
" ssh-keygen -K path [-w sk_provider]\n");
fprintf(stderr,
" ssh-keygen -F hostname [-lv] [-f known_hosts_file]\n"
" ssh-keygen -H [-f known_hosts_file]\n"
" ssh-keygen -K [-w provider]\n"
" ssh-keygen -R hostname [-f known_hosts_file]\n"
" ssh-keygen -r hostname [-g] [-f input_keyfile]\n"
#ifdef WITH_OPENSSL
" ssh-keygen -M generate [-O option] output\n"
" ssh-keygen -M screen [-f input_file] [-O option] [-a rounds] output_file\n"
" ssh-keygen -M generate [-O option] output_file\n"
" ssh-keygen -M screen [-f input_file] [-O option] output_file\n"
#endif
" ssh-keygen -I certificate_identity -s ca_key [-hU] [-D pkcs11_provider]\n"
" [-n principals] [-O option] [-V validity_interval]\n"