Azure
/
sonic-openssh
зеркало из https://github.com/Azure/sonic-openssh.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

upstream: group and sort single letter options; ok deraadt 

OpenBSD-Commit-ID: e1480e760a2b582f79696cdcff70098e23fc603f
This commit is contained in:
jmc@openbsd.org 2019-09-29 16:31:57 +00:00 коммит произвёл Damien Miller
Родитель 3b44bf39ff
Коммит 6c91d42cce
2 изменённых файлов: 9 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
ssh-keygen.1
Просмотреть файл

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keygen.1,v 1.169 2019/09/27 20:03:24 jmc Exp $ .\" $OpenBSD: ssh-keygen.1,v 1.170 2019/09/29 16:31:57 jmc Exp $
.\" .\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland .\" 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 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.Dd $Mdocdate: September 27 2019 $ .Dd $Mdocdate: September 29 2019 $
.Dt SSH-KEYGEN 1 .Dt SSH-KEYGEN 1
.Os .Os
.Sh NAME .Sh NAME
@ -85,9 +85,8 @@
.Fl D Ar pkcs11 .Fl D Ar pkcs11
.Nm ssh-keygen .Nm ssh-keygen
.Fl F Ar hostname .Fl F Ar hostname
.Op Fl lv
.Op Fl f Ar known_hosts_file .Op Fl f Ar known_hosts_file
.Op Fl l
.Op Fl v
.Nm ssh-keygen .Nm ssh-keygen
.Fl H .Fl H
.Op Fl f Ar known_hosts_file .Op Fl f Ar known_hosts_file
@ -96,8 +95,8 @@
.Op Fl f Ar known_hosts_file .Op Fl f Ar known_hosts_file
.Nm ssh-keygen .Nm ssh-keygen
.Fl r Ar hostname .Fl r Ar hostname
.Op Fl f Ar input_keyfile
.Op Fl g .Op Fl g
.Op Fl f Ar input_keyfile
.Nm ssh-keygen .Nm ssh-keygen
.Fl G Ar output_file .Fl G Ar output_file
.Op Fl v .Op Fl v
@ -116,8 +115,7 @@
.Nm ssh-keygen .Nm ssh-keygen
.Fl s Ar ca_key .Fl s Ar ca_key
.Fl I Ar certificate_identity .Fl I Ar certificate_identity
.Op Fl h .Op Fl hU
.Op Fl U
.Op Fl D Ar pkcs11_provider .Op Fl D Ar pkcs11_provider
.Op Fl n Ar principals .Op Fl n Ar principals
.Op Fl O Ar option .Op Fl O Ar option

8
ssh-keygen.c
Просмотреть файл

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.351 2019/09/24 12:50:46 deraadt Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.352 2019/09/29 16:31:57 jmc Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2723,16 +2723,16 @@ usage(void)
" ssh-keygen -D pkcs11\n"); " ssh-keygen -D pkcs11\n");
#endif #endif
fprintf(stderr, fprintf(stderr,
" ssh-keygen -F hostname [-f known_hosts_file] [-l]\n" " ssh-keygen -F hostname [-lv] [-f known_hosts_file]\n"
" ssh-keygen -H [-f known_hosts_file]\n" " ssh-keygen -H [-f known_hosts_file]\n"
" ssh-keygen -R hostname [-f known_hosts_file]\n" " ssh-keygen -R hostname [-f known_hosts_file]\n"
" ssh-keygen -r hostname [-f input_keyfile] [-g]\n" " ssh-keygen -r hostname [-g] [-f input_keyfile]\n"
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
" ssh-keygen -G output_file [-v] [-b bits] [-M memory] [-S start_point]\n" " ssh-keygen -G output_file [-v] [-b bits] [-M memory] [-S start_point]\n"
" ssh-keygen -T output_file -f input_file [-v] [-a rounds] [-J num_lines]\n" " ssh-keygen -T output_file -f input_file [-v] [-a rounds] [-J num_lines]\n"
" [-j start_line] [-K checkpt] [-W generator]\n" " [-j start_line] [-K checkpt] [-W generator]\n"
#endif #endif
" ssh-keygen -s ca_key -I certificate_identity [-h] [-U]\n" " ssh-keygen -s ca_key -I certificate_identity [-hU]\n"
" [-D pkcs11_provider] [-n principals] [-O option]\n" " [-D pkcs11_provider] [-n principals] [-O option]\n"
" [-V validity_interval] [-z serial_number] file ...\n" " [-V validity_interval] [-z serial_number] file ...\n"
" ssh-keygen -L [-f input_keyfile]\n" " ssh-keygen -L [-f input_keyfile]\n"