2 files changed, 53 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d4b64739..333a64c7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -110,6 +110,9 @@
   - david@cvs.openbsd.org 2006/02/15 05:08:24
     [sftp-client.c]
     typo in comment; ok djm@
+   - jmc@cvs.openbsd.org 2006/02/15 16:53:20
+     [ssh.1]
+     remove the IETF draft references and replace them with some updated RFCs;
 20060313
 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4011,4 +4014,4 @@
   - (djm) Trim deprecated options from INSTALL. Mention UsePAM
   - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4170 2006/03/15 00:34:25 djm Exp $
+$Id: ChangeLog,v 1.4171 2006/03/15 00:34:45 djm Exp $
diff --git a/ssh.1 b/ssh.1
index ba02e6c90..b9bbe0bd6 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (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.1,v 1.255 2006/02/06 21:44:47 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.256 2006/02/15 16:53:20 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -1339,15 +1339,54 @@ manual page for more information.
 .Xr ssh-keysign 8 ,
 .Xr sshd 8
 .Rs
-.%A T. Ylonen
+.%R RFC 4250
-.%A T. Kivinen
+.%T "The Secure Shell (SSH) Protocol Assigned Numbers"
-.%A M. Saarinen
+.%D 2006
-.%A T. Rinne
+.Re
-.%A S. Lehtinen
+.Rs
-.%T "SSH Protocol Architecture"
+.%R RFC 4251
-.%N draft-ietf-secsh-architecture-12.txt
+.%T "The Secure Shell (SSH) Protocol Architecture"
-.%D January 2002
+.%D 2006
-.%O work in progress material
+.Re
+.Rs
+.%R RFC 4252
+.%T "The Secure Shell (SSH) Authentication Protocol"
+.%D 2006
+.Re
+.Rs
+.%R RFC 4253
+.%T "The Secure Shell (SSH) Transport Layer Protocol"
+.%D 2006
+.Re
+.Rs
+.%R RFC 4254
+.%T "The Secure Shell (SSH) Connection Protocol"
+.%D 2006
+.Re
+.Rs
+.%R RFC 4255
+.%T "Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints"
+.%D 2006
+.Re
+.Rs
+.%R RFC 4256
+.%T "Generic Message Exchange Authentication for the Secure Shell Protocol (SSH)"
+.%D 2006
+.Re
+.Rs
+.%R RFC 4335
+.%T "The Secure Shell (SSH) Session Channel Break Extension"
+.%D 2006
+.Re
+.Rs
+.%R RFC 4344
+.%T "The Secure Shell (SSH) Transport Layer Encryption Modes"
+.%D 2006
+.Re
+.Rs
+.%R RFC 4345
+.%T "Improved Arcfour Modes for the Secure Shell (SSH) Transport Layer Protocol"
+.%D 2006
 .Re
 .Sh AUTHORS
 OpenSSH is a derivative of the original and free

diff --git a/ChangeLog b/ChangeLog index 4d4b64739..333a64c7d 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -110,6 +110,9 @@
110	- david@cvs.openbsd.org 2006/02/15 05:08:24	110	- david@cvs.openbsd.org 2006/02/15 05:08:24
111	[sftp-client.c]	111	[sftp-client.c]
112	typo in comment; ok djm@	112	typo in comment; ok djm@
		113	- jmc@cvs.openbsd.org 2006/02/15 16:53:20
		114	[ssh.1]
		115	remove the IETF draft references and replace them with some updated RFCs;
113		116
114	20060313	117	20060313
115	- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)	118	- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4011,4 +4014,4 @@
4011	- (djm) Trim deprecated options from INSTALL. Mention UsePAM	4014	- (djm) Trim deprecated options from INSTALL. Mention UsePAM
4012	- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu	4015	- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4013		4016
4014	$Id: ChangeLog,v 1.4170 2006/03/15 00:34:25 djm Exp $	4017	$Id: ChangeLog,v 1.4171 2006/03/15 00:34:45 djm Exp $


diff --git a/ssh.1 b/ssh.1 index ba02e6c90..b9bbe0bd6 100644 --- a/ssh.1 +++ b/ssh.1
@@ -34,7 +34,7 @@
34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36	.\"	36	.\"
37	.\" $OpenBSD: ssh.1,v 1.255 2006/02/06 21:44:47 jmc Exp $	37	.\" $OpenBSD: ssh.1,v 1.256 2006/02/15 16:53:20 jmc Exp $
38	.Dd September 25, 1999	38	.Dd September 25, 1999
39	.Dt SSH 1	39	.Dt SSH 1
40	.Os	40	.Os
@@ -1339,15 +1339,54 @@ manual page for more information.
1339	.Xr ssh-keysign 8 ,	1339	.Xr ssh-keysign 8 ,
1340	.Xr sshd 8	1340	.Xr sshd 8
1341	.Rs	1341	.Rs
1342	.%A T. Ylonen	1342	.%R RFC 4250
1343	.%A T. Kivinen	1343	.%T "The Secure Shell (SSH) Protocol Assigned Numbers"
1344	.%A M. Saarinen	1344	.%D 2006
1345	.%A T. Rinne	1345	.Re
1346	.%A S. Lehtinen	1346	.Rs
1347	.%T "SSH Protocol Architecture"	1347	.%R RFC 4251
1348	.%N draft-ietf-secsh-architecture-12.txt	1348	.%T "The Secure Shell (SSH) Protocol Architecture"
1349	.%D January 2002	1349	.%D 2006
1350	.%O work in progress material	1350	.Re
		1351	.Rs
		1352	.%R RFC 4252
		1353	.%T "The Secure Shell (SSH) Authentication Protocol"
		1354	.%D 2006
		1355	.Re
		1356	.Rs
		1357	.%R RFC 4253
		1358	.%T "The Secure Shell (SSH) Transport Layer Protocol"
		1359	.%D 2006
		1360	.Re
		1361	.Rs
		1362	.%R RFC 4254
		1363	.%T "The Secure Shell (SSH) Connection Protocol"
		1364	.%D 2006
		1365	.Re
		1366	.Rs
		1367	.%R RFC 4255
		1368	.%T "Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints"
		1369	.%D 2006
		1370	.Re
		1371	.Rs
		1372	.%R RFC 4256
		1373	.%T "Generic Message Exchange Authentication for the Secure Shell Protocol (SSH)"
		1374	.%D 2006
		1375	.Re
		1376	.Rs
		1377	.%R RFC 4335
		1378	.%T "The Secure Shell (SSH) Session Channel Break Extension"
		1379	.%D 2006
		1380	.Re
		1381	.Rs
		1382	.%R RFC 4344
		1383	.%T "The Secure Shell (SSH) Transport Layer Encryption Modes"
		1384	.%D 2006
		1385	.Re
		1386	.Rs
		1387	.%R RFC 4345
		1388	.%T "Improved Arcfour Modes for the Secure Shell (SSH) Transport Layer Protocol"
		1389	.%D 2006
1351	.Re	1390	.Re
1352	.Sh AUTHORS	1391	.Sh AUTHORS
1353	OpenSSH is a derivative of the original and free	1392	OpenSSH is a derivative of the original and free