From b7c9232da18f3b5a0e2db38bb662828a85567f56 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 5 Mar 2001 05:10:52 +0000 Subject: - deraadt@cvs.openbsd.org 2001/02/22 06:43:55 [ssh-keygen.1 ssh-keygen.c] document -d, and -t defaults to rsa1 --- ChangeLog | 5 ++++- ssh-keygen.1 | 9 +++++++-- ssh-keygen.c | 5 +++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 964bf3383..2488b94d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,9 @@ - deraadt@cvs.openbsd.org 2001/02/22 04:29:37 [servconf.c] grammar; slade@shore.net + - deraadt@cvs.openbsd.org 2001/02/22 06:43:55 + [ssh-keygen.1 ssh-keygen.c] + document -d, and -t defaults to rsa1 20010304 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. @@ -4211,4 +4214,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.857 2001/03/05 05:07:52 mouring Exp $ +$Id: ChangeLog,v 1.858 2001/03/05 05:10:52 mouring Exp $ diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 6661bfb10..516e05ed4 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.30 2001/02/08 19:22:38 itojun Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.31 2001/02/22 06:43:55 deraadt Exp $ .\" .\" -*- nroff -*- .\" @@ -165,7 +165,12 @@ or .Dq dsa for protocol version 2. The default is -.Dq rsa . +.Dq rsa1 . +.It Fl d +Specifies +.Dq dsa +key type (shortcut for +.Fl t Ar dsa) .It Fl C Ar comment Provides the new comment. .It Fl N Ar new_passphrase diff --git a/ssh-keygen.c b/ssh-keygen.c index f573db481..3fd0e3df5 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.43 2001/02/12 16:16:23 markus Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.44 2001/02/22 06:43:55 deraadt Exp $"); #include #include @@ -605,7 +605,8 @@ do_change_comment(struct passwd *pw) void usage(void) { - printf("Usage: %s [-lpqxXyc] [-t type] [-b bits] [-f file] [-C comment] [-N new-pass] [-P pass]\n", __progname); + printf("Usage: %s [-lpqxXycd] [-t type] [-b bits] [-f file] [-C comment] " + "[-N new-pass] [-P pass]\n", __progname); exit(1); } -- cgit v1.2.3