92 files changed, 96 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 62ffb469..98b6cc35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -131,6 +131,10 @@
    - djm@cvs.openbsd.org 2006/03/25 01:30:23
      [sftp.c]
      "abormally" is a perfectly cromulent word, but "abnormally" is better
+   - djm@cvs.openbsd.org 2006/03/25 13:17:03
+     [atomicio.c auth-bsdauth.c auth-chall.c auth-options.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth-skey.c auth.c auth1.c auth2-chall.c auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c cipher-3des1.c cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c compress.c deattack.c dh.c dispatch.c fatal.c groupaccess.c hostfile.c kex.c kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c mac.c match.c md-sha256.c misc.c monitor.c monitor_fdpass.c monitor_mm.c monitor_wrap.c msg.c nchan.c packet.c progressmeter.c readconf.c readpass.c rsa.c scard.c scp.c servconf.c serverloop.c session.c sftp-client.c sftp-common.c sftp-glob.c sftp-server.c sftp.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c uuencode.c xmalloc.c]
+     Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
+     Theo nuked - our scripts to sync -portable need them in the files
 
 20060325
  - OpenBSD CVS Sync
@@ -4388,4 +4392,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.4275 2006/03/26 03:23:17 djm Exp $
+$Id: ChangeLog,v 1.4276 2006/03/26 03:24:48 djm Exp $
diff --git a/atomicio.c b/atomicio.c
index afe306b1..87fb9fe7 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: atomicio.c,v 1.16 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
  * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
diff --git a/auth-bsdauth.c b/auth-bsdauth.c
index 2ccbc9d4..c309e4a1 100644
--- a/auth-bsdauth.c
+++ b/auth-bsdauth.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-bsdauth.c,v 1.9 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
diff --git a/auth-chall.c b/auth-chall.c
index 7707023a..023e7ee0 100644
--- a/auth-chall.c
+++ b/auth-chall.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-chall.c,v 1.11 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
diff --git a/auth-options.c b/auth-options.c
index 77488a49..56d59841 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-options.c,v 1.35 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/auth-passwd.c b/auth-passwd.c
index df202dde..2ebcc5fc 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-passwd.c,v 1.36 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/auth-rh-rsa.c b/auth-rh-rsa.c
index f9c386db..c8bdfa26 100644
--- a/auth-rh-rsa.c
+++ b/auth-rh-rsa.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-rh-rsa.c,v 1.40 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/auth-rhosts.c b/auth-rhosts.c
index 09889356..ce72adb7 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-rhosts.c,v 1.37 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/auth-rsa.c b/auth-rsa.c
index effff5d2..a906eb2d 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-rsa.c,v 1.66 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/auth-skey.c b/auth-skey.c
index 3e6a06db..9c981ec8 100644
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-skey.c,v 1.23 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
diff --git a/auth.c b/auth.c
index aa6d6607..bf2948a8 100644
--- a/auth.c
+++ b/auth.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth.c,v 1.66 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/auth1.c b/auth1.c
index 2f8e13e0..6a6cff86 100644
--- a/auth1.c
+++ b/auth1.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth1.c,v 1.66 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
diff --git a/auth2-chall.c b/auth2-chall.c
index d54ee285..09412aa4 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth2-chall.c,v 1.27 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index 25182849..8d5f3835 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth2-hostbased.c,v 1.8 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/auth2-kbdint.c b/auth2-kbdint.c
index 1b902e4c..796714ee 100644
--- a/auth2-kbdint.c
+++ b/auth2-kbdint.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth2-kbdint.c,v 1.4 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/auth2-none.c b/auth2-none.c
index 19cc2b1b..3fdf09a3 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth2-none.c,v 1.10 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/auth2-passwd.c b/auth2-passwd.c
index 41507af1..a1e77c41 100644
--- a/auth2-passwd.c
+++ b/auth2-passwd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth2-passwd.c,v 1.7 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index a59c3799..8786014f 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth2-pubkey.c,v 1.12 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/auth2.c b/auth2.c
index 9d3263e5..8f7ec0d6 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth2.c,v 1.110 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/authfd.c b/authfd.c
index fc322b98..93514376 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: authfd.c,v 1.72 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/authfile.c b/authfile.c
index 55c66d1e..b95b9470 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: authfile.c,v 1.66 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/bufaux.c b/bufaux.c
index 19f6708f..b7c9f2ec 100644
--- a/bufaux.c
+++ b/bufaux.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: bufaux.c,v 1.39 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/buffer.c b/buffer.c
index 1666f742..de404e60 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: buffer.c,v 1.26 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/canohost.c b/canohost.c
index b1c35e99..35ae9bed 100644
--- a/canohost.c
+++ b/canohost.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: canohost.c,v 1.53 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/channels.c b/channels.c
index 5706833a..c838b853 100644
--- a/channels.c
+++ b/channels.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: channels.c,v 1.244 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/cipher-3des1.c b/cipher-3des1.c
index 53b5a295..c2c0bf81 100644
--- a/cipher-3des1.c
+++ b/cipher-3des1.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cipher-3des1.c,v 1.4 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2003 Markus Friedl.  All rights reserved.
  *
diff --git a/cipher-bf1.c b/cipher-bf1.c
index e7246650..b6aa0152 100644
--- a/cipher-bf1.c
+++ b/cipher-bf1.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cipher-bf1.c,v 1.3 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2003 Markus Friedl.  All rights reserved.
  *
diff --git a/cipher-ctr.c b/cipher-ctr.c
index 9615f5aa..be82fd3a 100644
--- a/cipher-ctr.c
+++ b/cipher-ctr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cipher-ctr.c,v 1.8 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
  *
diff --git a/cipher.c b/cipher.c
index 15397db0..c4296389 100644
--- a/cipher.c
+++ b/cipher.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cipher.c,v 1.79 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/cleanup.c b/cleanup.c
index 7b40ca78..dcf45683 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cleanup.c,v 1.3 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
  *
diff --git a/clientloop.c b/clientloop.c
index aa4ebb3a..c136dae3 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: clientloop.c,v 1.160 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/compat.c b/compat.c
index 24d9a7f3..1573ed64 100644
--- a/compat.c
+++ b/compat.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: compat.c,v 1.73 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
diff --git a/compress.c b/compress.c
index 6f8d6b77..8aba84ef 100644
--- a/compress.c
+++ b/compress.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: compress.c,v 1.23 2006/03/25 13:17:01 djm Exp $ */
 /*