From 7192433633b8d4fa4315bc42eb50493c3a1125c8 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 20 Jun 2012 21:52:38 +1000 Subject: [PATCH] - dtucker@cvs.openbsd.org 2012/06/18 11:49:58 [ssh_config.5] RSA instead of DSA twice. From Steve.McClellan at radisys com --- ChangeLog | 3 +++ ssh_config.5 | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32eb1dfce..47b1c1652 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,9 @@ - dtucker@cvs.openbsd.org 2012/06/18 11:43:53 [jpake.c] correct sizeof usage. patch from saw at online.de, ok deraadt + - dtucker@cvs.openbsd.org 2012/06/18 11:49:58 + [ssh_config.5] + RSA instead of DSA twice. From Steve.McClellan at radisys com 20120519 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch diff --git a/ssh_config.5 b/ssh_config.5 index 78a542dc0..c9917d25b 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.154 2011/09/09 00:43:00 djm Exp $ -.Dd $Mdocdate: September 9 2011 $ +.\" $OpenBSD: ssh_config.5,v 1.155 2012/06/18 11:49:58 dtucker Exp $ +.Dd $Mdocdate: June 18 2012 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -612,7 +612,7 @@ offers many different identities. The default is .Dq no . .It Cm IdentityFile -Specifies a file from which the user's DSA, ECDSA or DSA authentication +Specifies a file from which the user's DSA, ECDSA or RSA authentication identity is read. The default is .Pa ~/.ssh/identity