Windows TAP driver license text changes.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1764 e7ae566f-a301-0410-adde-c780ea21d3b5

19 files changed, 174 insertions, 168 deletions

diff --git a/COPYING b/COPYING
index 7f5fa3d..e52ce71 100644
--- a/COPYING
+++ b/COPYING
@@ -45,12 +45,18 @@ LZO license:
  
   Markus F.X.J. Oberhumer
 
-TAP-Win32 Driver license:
--------------------------
-
-  The TAP-Win32 driver is derived from the CIPE-Win32
-  kernel driver, Copyright (C) Damion K. Wilson,
-  and is licensed under the GPL.
+TAP-Win32/TAP-Win64 Driver license:
+-----------------------------------
+
+  This device driver was inspired by the CIPE-Win32 driver by
+  Damion K. Wilson.
+
+  The source and object code of the TAP-Win32/TAP-Win64 driver
+  is Copyright (C) 2002-2007 OpenVPN Solutions LLC, and is released under
+  the GPL version 2 (see below), however due to the extra costs of
+  supporting Windows Vista, OpenVPN Solutions LLC reserves the right to
+  change the terms of the TAP-Win32/TAP-Win64 license for versions 9.1
+  and higher prior to the official release of OpenVPN 2.1.
 
 Windows DDK Samples:
 --------------------
diff --git a/tap-win32/common.h b/tap-win32/common.h
index 5aaab20..4589740 100755
--- a/tap-win32/common.h
+++ b/tap-win32/common.h
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/constants.h b/tap-win32/constants.h
index 6a5c760..a16e425 100755
--- a/tap-win32/constants.h
+++ b/tap-win32/constants.h
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/dhcp.c b/tap-win32/dhcp.c
index 1d8f303..5a9c86b 100755
--- a/tap-win32/dhcp.c
+++ b/tap-win32/dhcp.c
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/dhcp.h b/tap-win32/dhcp.h
index 8a573f8..ae3815b 100755
--- a/tap-win32/dhcp.h
+++ b/tap-win32/dhcp.h
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/endian.h b/tap-win32/endian.h
index 3032dea..30db3a8 100755
--- a/tap-win32/endian.h
+++ b/tap-win32/endian.h
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device
- *               functionality on Windows.  Originally derived
- *               from the CIPE-Win32 project by Damion K. Wilson,
- *               with extensive modifications by James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/error.c b/tap-win32/error.c
index 3e52eb0..77746e6 100755
--- a/tap-win32/error.c
+++ b/tap-win32/error.c
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/error.h b/tap-win32/error.h
index 21137e5..b597ed8 100755
--- a/tap-win32/error.h
+++ b/tap-win32/error.h
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/hexdump.c b/tap-win32/hexdump.c
index 69ca418..6624f22 100755
--- a/tap-win32/hexdump.c
+++ b/tap-win32/hexdump.c
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/hexdump.h b/tap-win32/hexdump.h
index 4963dbf..59f0f70 100755
--- a/tap-win32/hexdump.h
+++ b/tap-win32/hexdump.h
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/instance.c b/tap-win32/instance.c
index 53c800c..c0ccbd5 100755
--- a/tap-win32/instance.c
+++ b/tap-win32/instance.c
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device
- *               functionality on Windows.  Originally derived
- *               from the CIPE-Win32 project by Damion K. Wilson,
- *               with extensive modifications by James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/lock.h b/tap-win32/lock.h
index 8598f31..6643b25 100755
--- a/tap-win32/lock.h
+++ b/tap-win32/lock.h
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device
- *               functionality on Windows.  Originally derived
- *               from the CIPE-Win32 project by Damion K. Wilson,
- *               with extensive modifications by James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/macinfo.c b/tap-win32/macinfo.c
index bc75f3d..03c0b2c 100755
--- a/tap-win32/macinfo.c
+++ b/tap-win32/macinfo.c
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/macinfo.h b/tap-win32/macinfo.h
index 71a17c3..4098777 100755
--- a/tap-win32/macinfo.h
+++ b/tap-win32/macinfo.h
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/mem.c b/tap-win32/mem.c
index 5df7206..c418e1f 100755
--- a/tap-win32/mem.c
+++ b/tap-win32/mem.c
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/proto.h b/tap-win32/proto.h
index 6a70beb..994d322 100755
--- a/tap-win32/proto.h
+++ b/tap-win32/proto.h
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/prototypes.h b/tap-win32/prototypes.h
index 55895c4..2bd9961 100755
--- a/tap-win32/prototypes.h
+++ b/tap-win32/prototypes.h
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/tapdrvr.c b/tap-win32/tapdrvr.c
index 3ad1060..3d3c224 100755
--- a/tap-win32/tapdrvr.c
+++ b/tap-win32/tapdrvr.c
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device
- *               functionality on Windows.  Originally derived
- *               from the CIPE-Win32 project by Damion K. Wilson,
- *               with extensive modifications by James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2006 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/tap-win32/types.h b/tap-win32/types.h
index 45e0033..f9ab5c1 100755
--- a/tap-win32/types.h
+++ b/tap-win32/types.h
@@ -1,15 +1,15 @@
 /*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
+ *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
+ *                         device functionality on Windows.
  *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
+ *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
+ *  This source code is Copyright (C) 2002-2007 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below), however due
+ *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
+ *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
+ *  license for versions 9.1 and higher prior to the official release of
+ *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2