summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ssh-keygen.14
-rw-r--r--ssh-keygen.c6
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index fa869b11f..a8e28d7f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
5 do not use a list for SYNOPSIS; 5 do not use a list for SYNOPSIS;
6 this is actually part of a larger report sent by eric s. raymond 6 this is actually part of a larger report sent by eric s. raymond
7 and forwarded by brad, but i only read half of it. spotted by brad. 7 and forwarded by brad, but i only read half of it. spotted by brad.
8 - jmc@cvs.openbsd.org 2007/01/12 20:20:41
9 [ssh-keygen.1 ssh-keygen.c]
10 more secsh -> rfc 4716 updates;
11 spotted by wiz@netbsd
12 ok markus
8 13
920070128 1420070128
10 - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52) 15 - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52)
@@ -2700,4 +2705,4 @@
2700 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2705 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2701 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2706 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2702 2707
2703$Id: ChangeLog,v 1.4610 2007/02/19 11:08:17 dtucker Exp $ 2708$Id: ChangeLog,v 1.4611 2007/02/19 11:09:06 dtucker Exp $
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 850ac327b..5a8c8c471 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.73 2006/12/11 21:25:46 markus Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.74 2007/01/12 20:20:41 jmc Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -253,7 +253,7 @@ in SSH2-compatible format and print an OpenSSH compatible private
253(or public) key to stdout. 253(or public) key to stdout.
254.Nm 254.Nm
255also reads the 255also reads the
256.Sq SECSH Public Key File Format . 256RFC 4716 SSH Public Key File Format.
257This option allows importing keys from several commercial 257This option allows importing keys from several commercial
258SSH implementations. 258SSH implementations.
259.It Fl l 259.It Fl l
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 670024b2e..ed3cdb3ed 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.158 2007/01/03 03:01:40 stevesk Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.159 2007/01/12 20:20:41 jmc Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1016,13 +1016,13 @@ usage(void)
1016#ifdef SMARTCARD 1016#ifdef SMARTCARD
1017 fprintf(stderr, " -D reader Download public key from smartcard.\n"); 1017 fprintf(stderr, " -D reader Download public key from smartcard.\n");
1018#endif /* SMARTCARD */ 1018#endif /* SMARTCARD */
1019 fprintf(stderr, " -e Convert OpenSSH to IETF SECSH key file.\n"); 1019 fprintf(stderr, " -e Convert OpenSSH to RFC 4716 key file.\n");
1020 fprintf(stderr, " -F hostname Find hostname in known hosts file.\n"); 1020 fprintf(stderr, " -F hostname Find hostname in known hosts file.\n");
1021 fprintf(stderr, " -f filename Filename of the key file.\n"); 1021 fprintf(stderr, " -f filename Filename of the key file.\n");
1022 fprintf(stderr, " -G file Generate candidates for DH-GEX moduli.\n"); 1022 fprintf(stderr, " -G file Generate candidates for DH-GEX moduli.\n");
1023 fprintf(stderr, " -g Use generic DNS resource record format.\n"); 1023 fprintf(stderr, " -g Use generic DNS resource record format.\n");
1024 fprintf(stderr, " -H Hash names in known_hosts file.\n"); 1024 fprintf(stderr, " -H Hash names in known_hosts file.\n");
1025 fprintf(stderr, " -i Convert IETF SECSH to OpenSSH key file.\n"); 1025 fprintf(stderr, " -i Convert RFC 4716 to OpenSSH key file.\n");
1026 fprintf(stderr, " -l Show fingerprint of key file.\n"); 1026 fprintf(stderr, " -l Show fingerprint of key file.\n");
1027 fprintf(stderr, " -M memory Amount of memory (MB) to use for generating DH-GEX moduli.\n"); 1027 fprintf(stderr, " -M memory Amount of memory (MB) to use for generating DH-GEX moduli.\n");
1028 fprintf(stderr, " -N phrase Provide new passphrase.\n"); 1028 fprintf(stderr, " -N phrase Provide new passphrase.\n");