- markus@cvs.openbsd.org 2001/06/25 08:25:41

     [channels.c channels.h cipher.c clientloop.c compat.c compat.h
      hostfile.c kex.c kex.h key.c key.h nchan.c packet.c serverloop.c
      session.c session.h sftp-server.c ssh-add.c ssh-agent.c uuencode.h]
     update copyright for 2001

diff --git a/ChangeLog b/ChangeLog
index 65a9a2894d82f25a28ac2bbb20a657b4f1770d58..7eab60cbb844281ab9c50fc39d6c9e801df4ee1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+20010704
+ - OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2001/06/25 08:25:41
+     [channels.c channels.h cipher.c clientloop.c compat.c compat.h 
+      hostfile.c kex.c kex.h key.c key.h nchan.c packet.c serverloop.c 
+      session.c session.h sftp-server.c ssh-add.c ssh-agent.c uuencode.h]
+     update copyright for 2001
+
 20010629
  - (bal) Removed net_aton() since we don't use it any more
  - (bal) Fixed _DISABLE_VPOSIX in readpassphrase.c.

diff --git a/channels.c b/channels.c
index ce4c5952dad59ca9dfc5778eb58e41ef02475a32..2721ec6bc466205c036719a324331f65d16c80f4 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -12,9 +12,8 @@
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
  *
- *
  * SSH2 support added by Markus Friedl.
- * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 1999 Dug Song.  All rights reserved.
  * Copyright (c) 1999 Theo de Raadt.  All rights reserved.
  *
@@ -40,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.127 2001/06/23 15:12:17 itojun Exp $");
+RCSID("$OpenBSD: channels.c,v 1.128 2001/06/25 08:25:35 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"

diff --git a/channels.h b/channels.h
index 419b6362355548697ea04a46cbf644bb97427ea8..0ce8372bd312fce30e3e5296f26cc12711abffdd 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -10,7 +10,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 /*
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +32,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.
  */
-/* RCSID("$OpenBSD: channels.h,v 1.39 2001/06/20 13:56:39 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.40 2001/06/25 08:25:36 markus Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H

diff --git a/cipher.c b/cipher.c
index a7aacf284f2d93a730f2ceb9b7440c946e38860c..5f63cd4b2a90a9517e46bff9c8058304cd0d43c4 100644 (file)
--- a/cipher.c
+++ b/cipher.c
@@ -11,7 +11,7 @@
  *
  *
  * Copyright (c) 1999 Niels Provos.  All rights reserved.
- * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.45 2001/06/23 15:12:18 itojun Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.46 2001/06/25 08:25:36 markus Exp $");
 
 #include "xmalloc.h"
 #include "log.h"

diff --git a/clientloop.c b/clientloop.c
index c96aea56f7558b1de27918b93908f6a2a95663d3..05bcc3add8721c3b8914731e389898ec2ff3bb9d 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -35,7 +35,7 @@
  *
  *
  * SSH2 support added by Markus Friedl.
- * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.77 2001/06/23 15:12:18 itojun Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.78 2001/06/25 08:25:36 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"

diff --git a/compat.c b/compat.c
index cdfd2cf6dbd4fb13d8c9997b12e34c28b87e3898..77bba28a277cb6e1998a05396e7f5a5051308932 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.50 2001/04/30 16:02:49 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.51 2001/06/25 08:25:37 markus Exp $");
 
 #ifdef HAVE_LIBPCRE
 #  include <pcreposix.h>

diff --git a/compat.h b/compat.h
index 0ccc1ed375f4a38c952245f8702256ba392b7892..33eb7c1e8790474de53c81e12e116eaa52d5f6e9 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -21,7 +21,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.
  */
-/* RCSID("$OpenBSD: compat.h,v 1.25 2001/04/30 15:50:46 markus Exp $"); */
+/* RCSID("$OpenBSD: compat.h,v 1.26 2001/06/25 08:25:37 markus Exp $"); */
 
 #ifndef COMPAT_H
 #define COMPAT_H

diff --git a/hostfile.c b/hostfile.c
index 39a1a83133a8d9eb79bfccf5d1406b56174d58fe..eeed920fa797a15f42d5e4eb598486be413c5699 100644 (file)
--- a/hostfile.c
+++ b/hostfile.c
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  *
  *
- * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 1999 Niels Provos.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.27 2001/06/23 15:12:18 itojun Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.28 2001/06/25 08:25:37 markus Exp $");
 
 #include "packet.h"
 #include "match.h"

diff --git a/kex.c b/kex.c
index 25b3b8f8a9ac9625bb27f6d32d0d4afaf832d96f..1a412ce0fcab2c98104d184d046b7b3c852a7880 100644 (file)
--- a/kex.c
+++ b/kex.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.35 2001/06/23 15:12:18 itojun Exp $");
+RCSID("$OpenBSD: kex.c,v 1.36 2001/06/25 08:25:37 markus Exp $");
 
 #include <openssl/crypto.h>
 

diff --git a/kex.h b/kex.h
index eca36b36a16024a15bae779c0d0f5a7877b5428f..ac7ad33f753dfa8304de0e3a65541e5f20baccd9 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -1,7 +1,7 @@
-/*     $OpenBSD: kex.h,v 1.23 2001/06/23 02:34:28 markus Exp $ */
+/*     $OpenBSD: kex.h,v 1.24 2001/06/25 08:25:37 markus Exp $ */
 
 /*
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/key.c b/key.c
index cbe08a4c11dfaa7c691003d5b49920373822ff7f..2000c2755b506dd6d96d4fe264c53fc5d3da716b 100644 (file)
--- a/key.c
+++ b/key.c
@@ -9,7 +9,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  *
  *
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: key.c,v 1.27 2001/06/23 15:12:19 itojun Exp $");
+RCSID("$OpenBSD: key.c,v 1.28 2001/06/25 08:25:37 markus Exp $");
 
 #include <openssl/evp.h>
 

diff --git a/key.h b/key.h
index cee31c30a683c5a92cf4ea07c8e731db829e690e..7f4e5f017c1c33e66eb9abc3b407dac2554830f7 100644 (file)
--- a/key.h
+++ b/key.h
@@ -1,7 +1,7 @@
-/*     $OpenBSD: key.h,v 1.12 2001/04/17 10:53:24 markus Exp $ */
+/*     $OpenBSD: key.h,v 1.13 2001/06/25 08:25:38 markus Exp $ */
 
 /*
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/nchan.c b/nchan.c
index 8916c13f4593c96cae0fb72d0613d15246a7b8aa..8e1be2d36b9c3b93a58554493954b37292360132 100644 (file)
--- a/nchan.c
+++ b/nchan.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.29 2001/06/23 15:12:19 itojun Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.30 2001/06/25 08:25:38 markus Exp $");
 
 #include "ssh1.h"
 #include "ssh2.h"

diff --git a/packet.c b/packet.c
index 5365abaec8765db3f77d45523f61634699669043..9aa686aa740d73715f33a9a16885b292cb8a458e 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -13,7 +13,7 @@
  *
  *
  * SSH2 packet format added by Markus Friedl.
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.68 2001/06/23 15:12:19 itojun Exp $");
+RCSID("$OpenBSD: packet.c,v 1.69 2001/06/25 08:25:38 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"

diff --git a/serverloop.c b/serverloop.c
index 1ffa4dbfb99ac60b0e1b06249df3eaab41a9139a..2eb8603d1565092638603371521c8875d2dd1b70 100644 (file)
--- a/serverloop.c
+++ b/serverloop.c
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  *
  * SSH2 support by Markus Friedl.
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.70 2001/06/23 15:12:19 itojun Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.71 2001/06/25 08:25:39 markus Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"

diff --git a/session.c b/session.c
index e50fd68bc0f62cca3d5f2ad34fb553ae8881ab45..7d0e0723ce285be3026e1b742bf427131da0bb52 100644 (file)
--- a/session.c
+++ b/session.c
@@ -9,7 +9,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  *
  * SSH2 support by Markus Friedl.
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.94 2001/06/23 15:12:20 itojun Exp $");
+RCSID("$OpenBSD: session.c,v 1.95 2001/06/25 08:25:39 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"

diff --git a/session.h b/session.h
index 842e9412a0d2d420f3d89535dba02a6f301600f6..bda1e50b5939524f62bf65d7b85a4d78d9a3ee93 100644 (file)
--- a/session.h
+++ b/session.h
@@ -1,7 +1,7 @@
-/*     $OpenBSD: session.h,v 1.6 2001/03/21 11:43:45 markus Exp $      */
+/*     $OpenBSD: session.h,v 1.7 2001/06/25 08:25:39 markus Exp $      */
 
 /*
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/sftp-server.c b/sftp-server.c
index e6353bceb97a344dbcc9891750498d3e537c982e..5f1b37b014658a1051ce58629d274be19d05fdab 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: sftp-server.c,v 1.28 2001/06/23 15:12:20 itojun Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.29 2001/06/25 08:25:40 markus Exp $");
 
 #include "buffer.h"
 #include "bufaux.h"

diff --git a/ssh-add.c b/ssh-add.c
index 84a8c20f9648da4debd6bc75318545c5fee47237..d6a55446de91bed9cf872258b3f192055d93221a 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  *
  * SSH2 implementation,
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.40 2001/06/24 05:35:33 markus Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.41 2001/06/25 08:25:40 markus Exp $");
 
 #include <openssl/evp.h>
 

diff --git a/ssh-agent.c b/ssh-agent.c
index 6d94c6c29547a3f5b6400f6b2f2ceb91c934ed93..54b375fcec8de24d05a2f76afa66e093292c38b7 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ssh-agent.c,v 1.55 2001/06/23 15:12:20 itojun Exp $   */
+/*     $OpenBSD: ssh-agent.c,v 1.56 2001/06/25 08:25:40 markus Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -12,8 +12,7 @@
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
  *
- * SSH2 implementation,
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.55 2001/06/23 15:12:20 itojun Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.56 2001/06/25 08:25:40 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>

diff --git a/uuencode.h b/uuencode.h
index 42f83c2c06b50156b6f536a79c126227247fc099..1a2d63f523d7ddcd90222180cb12e7f5e7ad8514 100644 (file)
--- a/uuencode.h
+++ b/uuencode.h
@@ -1,7 +1,7 @@
-/*     $OpenBSD: uuencode.h,v 1.5 2001/01/29 01:58:19 niklas Exp $     */
+/*     $OpenBSD: uuencode.h,v 1.6 2001/06/25 08:25:41 markus Exp $     */
 
 /*
- * Copyright (c) 1999 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions