summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh-keygen.18
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d4999db48..555d047e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
5 hostfile.c kex.c kex.h key.c key.h nchan.c packet.c serverloop.c 5 hostfile.c kex.c kex.h key.c key.h nchan.c packet.c serverloop.c
6 session.c session.h sftp-server.c ssh-add.c ssh-agent.c uuencode.h] 6 session.c session.h sftp-server.c ssh-add.c ssh-agent.c uuencode.h]
7 update copyright for 2001 7 update copyright for 2001
8 - markus@cvs.openbsd.org 2001/06/25 17:18:27
9 [ssh-keygen.1]
10 sshd(8) will never read the private keys, but ssh(1) does;
11 hugh@mimosa.com
8 12
920010629 1320010629
10 - (bal) Removed net_aton() since we don't use it any more 14 - (bal) Removed net_aton() since we don't use it any more
@@ -5832,4 +5836,4 @@
5832 - Wrote replacements for strlcpy and mkdtemp 5836 - Wrote replacements for strlcpy and mkdtemp
5833 - Released 1.0pre1 5837 - Released 1.0pre1
5834 5838
5835$Id: ChangeLog,v 1.1345 2001/07/04 03:32:30 mouring Exp $ 5839$Id: ChangeLog,v 1.1346 2001/07/04 03:35:24 mouring Exp $
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 4209dbd62..1ea944c7c 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.45 2001/06/23 05:57:09 deraadt Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.46 2001/06/25 17:18:27 markus Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -210,7 +210,7 @@ used to encrypt the private part of this file using 3DES.
210This file is not automatically accessed by 210This file is not automatically accessed by
211.Nm 211.Nm
212but it is offered as the default file for the private key. 212but it is offered as the default file for the private key.
213.Xr sshd 8 213.Xr ssh 1
214will read this file when a login attempt is made. 214will read this file when a login attempt is made.
215.It Pa $HOME/.ssh/identity.pub 215.It Pa $HOME/.ssh/identity.pub
216Contains the protocol version 1 RSA public key for authentication. 216Contains the protocol version 1 RSA public key for authentication.
@@ -228,7 +228,7 @@ used to encrypt the private part of this file using 3DES.
228This file is not automatically accessed by 228This file is not automatically accessed by
229.Nm 229.Nm
230but it is offered as the default file for the private key. 230but it is offered as the default file for the private key.
231.Xr sshd 8 231.Xr ssh 1
232will read this file when a login attempt is made. 232will read this file when a login attempt is made.
233.It Pa $HOME/.ssh/id_dsa.pub 233.It Pa $HOME/.ssh/id_dsa.pub
234Contains the protocol version 2 DSA public key for authentication. 234Contains the protocol version 2 DSA public key for authentication.
@@ -246,7 +246,7 @@ used to encrypt the private part of this file using 3DES.
246This file is not automatically accessed by 246This file is not automatically accessed by
247.Nm 247.Nm
248but it is offered as the default file for the private key. 248but it is offered as the default file for the private key.
249.Xr sshd 8 249.Xr ssh 1
250will read this file when a login attempt is made. 250will read this file when a login attempt is made.
251.It Pa $HOME/.ssh/id_rsa.pub 251.It Pa $HOME/.ssh/id_rsa.pub
252Contains the protocol version 2 RSA public key for authentication. 252Contains the protocol version 2 RSA public key for authentication.