From e54724b077ef82c52eed4c3fae40d606fadc0bf6 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 11 Dec 2009 05:13:24 +0000 Subject: [PATCH] Clarified that TAP-Win32 driver is licensed under GPL 2. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@5265 e7ae566f-a301-0410-adde-c780ea21d3b5 --- COPYING | 5 +---- tap-win32/common.h | 6 +----- tap-win32/constants.h | 6 +----- tap-win32/dhcp.c | 6 +----- tap-win32/dhcp.h | 6 +----- tap-win32/endian.h | 6 +----- tap-win32/error.c | 6 +----- tap-win32/error.h | 6 +----- tap-win32/hexdump.c | 6 +----- tap-win32/hexdump.h | 6 +----- tap-win32/instance.c | 6 +----- tap-win32/lock.h | 6 +----- tap-win32/macinfo.c | 6 +----- tap-win32/macinfo.h | 6 +----- tap-win32/mem.c | 6 +----- tap-win32/proto.h | 6 +----- tap-win32/prototypes.h | 6 +----- tap-win32/tapdrvr.c | 6 +----- tap-win32/types.h | 6 +----- 19 files changed, 19 insertions(+), 94 deletions(-) diff --git a/COPYING b/COPYING index 21b13cdc..597c10a4 100644 --- a/COPYING +++ b/COPYING @@ -53,10 +53,7 @@ TAP-Win32/TAP-Win64 Driver license: The source and object code of the TAP-Win32/TAP-Win64 driver is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., and is released under - the GPL version 2 (see below), however due to the extra costs of - supporting Windows Vista, OpenVPN Technologies, Inc. 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. + the GPL version 2. Windows DDK Samples: -------------------- diff --git a/tap-win32/common.h b/tap-win32/common.h index b7c11576..c8dcd5d7 100755 --- a/tap-win32/common.h +++ b/tap-win32/common.h @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 fc7855dc..220d3d39 100755 --- a/tap-win32/constants.h +++ b/tap-win32/constants.h @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 b6b28bb7..8ef3917b 100755 --- a/tap-win32/dhcp.c +++ b/tap-win32/dhcp.c @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 8f40f540..babe31ec 100755 --- a/tap-win32/dhcp.h +++ b/tap-win32/dhcp.h @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 ef9376bc..7a298f41 100755 --- a/tap-win32/endian.h +++ b/tap-win32/endian.h @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 dd27024e..82757cce 100755 --- a/tap-win32/error.c +++ b/tap-win32/error.c @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 d779af0c..d3deb280 100755 --- a/tap-win32/error.h +++ b/tap-win32/error.h @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 f230569c..b30a8e75 100755 --- a/tap-win32/hexdump.c +++ b/tap-win32/hexdump.c @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 8814ed14..cfddcf12 100755 --- a/tap-win32/hexdump.h +++ b/tap-win32/hexdump.h @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 1c97823a..ef994ee6 100755 --- a/tap-win32/instance.c +++ b/tap-win32/instance.c @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 c3b52b1c..7c3a1a9d 100755 --- a/tap-win32/lock.h +++ b/tap-win32/lock.h @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 49f21f95..c03a8c5f 100755 --- a/tap-win32/macinfo.c +++ b/tap-win32/macinfo.c @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 60ea8cc3..774e5d6c 100755 --- a/tap-win32/macinfo.h +++ b/tap-win32/macinfo.h @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 ab4b2ede..3f8d9497 100755 --- a/tap-win32/mem.c +++ b/tap-win32/mem.c @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 6c53f401..e0597725 100755 --- a/tap-win32/proto.h +++ b/tap-win32/proto.h @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 29502d60..ff7733aa 100755 --- a/tap-win32/prototypes.h +++ b/tap-win32/prototypes.h @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 a856734b..2c6af485 100755 --- a/tap-win32/tapdrvr.c +++ b/tap-win32/tapdrvr.c @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * 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 4adee6a6..48bdff74 100755 --- a/tap-win32/types.h +++ b/tap-win32/types.h @@ -5,11 +5,7 @@ * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * * This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., - * 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. + * and is released under the GPL version 2 (see below). * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2