openvpn-devel Mailing List for OpenVPN

Hi Heiko, Some thoughts on this - by all means let me know your opinion though! 1) Makes sense - and that's what I'm doing currently, querying for proxy information (in Windows, including PAC files as well). 2) Unfortunately it's in Visual Basic - only because that takes care of all the GUI / Windows crud, so it makes that part pretty transparent. As for features, some thoughts ... - automatic proxy detection (and applying that information) - NTLM login to proxy server (using login information) - automatic reconnect (when network connections change), or no reconnect if on the same subnet as the server - recurring ping ... to provide RTT information (plot and histogram) - traffic plots (UL / DL traffic) ... and traffic indicators in the System Tray (state and traffic would be nice) Just a few ideas ... :-). Thanks! ... Russell On Wed, 02/29/2012 12:57 PM, Heiko Hund <hei...@so...> wrote: > Russell > > On Wednesday 29 February 2012 17:26:46 Russell Morris wrote: > > 1) I know that someone (Heiko?) was looking at auto-proxy a while back. Is > > this now working? Is there a way to test it (if it's now working), to see > > what it determines for a proxy? > > During discussion of the Windows --auto-proxy patches at FOSDEM we've decided > that the auto-proxy detection shouldn't take place within openvpn as it is > very platform specific and there's no apparent need to do it there. We removed > the --auto-proxy option from openvpn all together, it wasn't working much > anyway and was only supporting Windows. In a future alpha/beta 2.3 release a > GUI will be packaged that reacts to openvpn querying for proxy info via > management interface. Currently I can't offer much to test, though. Sorry. > > > 2) I have a Windows GUI of my own (and I don't mean this as a "competition" > > to the default OpenVPN GUI, not at all!!!). It's just tweaked for my > > personal situation, on and off LAN and wireless, proxy, no proxy, etc. It > > uses the management interface completely. In any case, it has some features > > that I like, more than anything wondering if there are thoughts of extending > > the current GUI to include items like this (as I'd rather use the official > > GUI, I'm no SW expert - not even close). In any case, I have attached a few > > pictures, in case someone has any ideas about new features for the official > > GUI. > > Could you elaborate on the features you want to see included, please. > Obviously you have some nice charts in your GUI. What language did you code > this in? I suppose it's not C with plain WIN32 API? > > Regards > Heiko > -- > Heiko Hund | Software Engineer | Phone +49-721-25516-237 | Fax -200 > Astaro a Sophos Company | Amalienbadstr. 41 Bau 52 | 76227 Karlsruhe | Germany > Commercial Register: Mannheim HRA 702710 | Headquarter Location: Karlsruhe > > Represented by the General Partner Astaro Verwaltungs GmbH > Amalienbadstraße 41 Bau 52 | 76227 Karlsruhe | Germany > Commercial Register: Mannheim HRB 708248 | Executive Board: Gert Hansen, > Markus Hennig, Jan Hichert, Günter Junk, Dr. Frank Nellissen > > > > 

> > > I never used script with openvpn. I've no idea which are real world > > applications for it. > > Scripts are for creative uses that the programmers of openvpn have not > foreseen. Like "after the VPN is up, auto-sync all your git repositories" > or "open up a few xterms with ssh's to $internalhosts". > > David had some other idea recently, which I forgot. > Scripts are used by Tunnelblick to provide support for features that OpenVPN does not support natively on OS X (such as several "--dhcp-option"s). 94% of Tunnelblick users use scripts. 

A comment on your [1] reference. The issue of remote-user vs enterprise is an old one - that affects many software applications - not just openvpn. I personally think the proper solution is to implement NAC: make "the network/enterprise" audit the remote host and only allow it if it meets expectations. As such I don't think openvpn has to solve this problem itself, as "the enterprise" cares a lot more about the remote machine than whether or not the remote user has injected a couple of routes into the local routing table. eg Windows AV status. I think openvpn is quite entitled to act as a "mere" vpn solution, "the enterprise" should invoke a more over-arching solution (such as NAC with NAC agents) to ensure policy compliance. Jason On 01/03/12 10:36, Alon Bar-Lev wrote: > 2012/2/29 Gert Doering <ge...@gr...>: >> Hi, >> >> On Wed, Feb 29, 2012 at 07:43:18PM +0100, Carsten Krüger wrote: >>>> Part of the assumption here is "the user controls the openvpn config", >>>> and as such, he can make openvpn.exe run arbitrary scripts anyway - and >>>> to stop this from being a problem, just run openvpn.exe with your uid. >>> What operation could be in script that is usefull when it's executed >>> in user context. >>> >>> I never used script with openvpn. I've no idea which are real world >>> applications for it. >> Scripts are for creative uses that the programmers of openvpn have not >> foreseen. Like "after the VPN is up, auto-sync all your git repositories" >> or "open up a few xterms with ssh's to $internalhosts". >> >> David had some other idea recently, which I forgot. > This is a great example why this functionality should *MOVE OUT* of > the openvpn code base. > The UI can monitor OpenVPN and run scripts when such events are > detected via the management interface. > The UI already runs in the context of the interactive user. > > I would like to receive replies to[1]. > > Thanks, > Alon. > > [1] http://sourceforge.net/mailarchive/message.php?msg_id=28910374 > > ------------------------------------------------------------------------------ > Virtualization & Cloud Management Using Capacity Planning > Cloud computing makes use of virtualization - but cloud computing > also focuses on allowing computing to be delivered as a service. > http://www.accelacomm.com/jaw/sfnl/114/51521223/ > _______________________________________________ > Openvpn-devel mailing list > Ope...@li... > https://lists.sourceforge.net/lists/listinfo/openvpn-devel -- Cheers Jason Haar Information Security Manager, Trimble Navigation Ltd. Phone: +1 408 481 8171 PGP Fingerprint: 7A2E 0407 C9A6 CAF6 2B9F 8422 C063 5EBB FE1D 66D1 

On Wed, Feb 29, 2012 at 11:59 PM, Gert Doering <ge...@gr...> wrote: > But I'm leaving this discussion now.  Heiko is doing the implementation > work, James, David and I have agreed (and told the list via IRC session > minutes!) that we think it's a useful way forward, and this is developing > into a bikeshed. Yes, I guessed from start that there is an emotional factor. It does not means that you had all the information before making that decision, and it does not mean that decisions cannot be reviewed when more information comes. So that's true, there no sense in this discussion. I just hope someone else will be more opened before making a very complex implementation. Alon. 

Hi, On Wed, Feb 29, 2012 at 11:36:46PM +0200, Alon Bar-Lev wrote: > > Scripts are for creative uses that the programmers of openvpn have not > > foreseen.  Like "after the VPN is up, auto-sync all your git repositories" > > or "open up a few xterms with ssh's to $internalhosts". > > > > David had some other idea recently, which I forgot. > > This is a great example why this functionality should *MOVE OUT* of > the openvpn code base. > The UI can monitor OpenVPN and run scripts when such events are > detected via the management interface. > The UI already runs in the context of the interactive user. But then you still have all the network, crypto and ssl stuff in the privileged process - and the holy cow of security aware programming is "keep the code base that runs privileged as small as possible". So moving out the (very small) bits that need privileges and leaving the rest in the runs-as-user code base is achieving the same thing (scripts run with user privileges) with a much smaller code base for privileged operations. But I'm leaving this discussion now. Heiko is doing the implementation work, James, David and I have agreed (and told the list via IRC session minutes!) that we think it's a useful way forward, and this is developing into a bikeshed. gert -- USENET is *not* the non-clickable part of WWW! //www.muc.de/~gert/ Gert Doering - Munich, Germany ge...@gr... fax: +49-89-35655025 ge...@ne... 

2012/2/29 Gert Doering <ge...@gr...>: > Hi, > > On Wed, Feb 29, 2012 at 07:43:18PM +0100, Carsten Krüger wrote: >> > Part of the assumption here is "the user controls the openvpn config", >> > and as such, he can make openvpn.exe run arbitrary scripts anyway - and >> > to stop this from being a problem, just run openvpn.exe with your uid. >> >> What operation could be in script that is usefull when it's executed >> in user context. >> >> I never used script with openvpn. I've no idea which are real world >> applications for it. > > Scripts are for creative uses that the programmers of openvpn have not > foreseen.  Like "after the VPN is up, auto-sync all your git repositories" > or "open up a few xterms with ssh's to $internalhosts". > > David had some other idea recently, which I forgot. This is a great example why this functionality should *MOVE OUT* of the openvpn code base. The UI can monitor OpenVPN and run scripts when such events are detected via the management interface. The UI already runs in the context of the interactive user. I would like to receive replies to[1]. Thanks, Alon. [1] http://sourceforge.net/mailarchive/message.php?msg_id=28910374 

Hi, On Wed, Feb 29, 2012 at 08:25:31PM +0100, Carsten Krüger wrote: > > Same here, please share your thoughts on how to reduce complexity. > > Dismiss the hole service starts openvpn in user context. It makes no > sense. From a pure security perspective, you're right - maximum security would be reached by running openvpn.exe in a completely unprivileged context (unix way: chroot(/var/empty), setuid(nobody)) to make sure that any possible bug that is network-exploitable cannot be used to gain access to the system. OTOH that would take away lots of the flexibility OpenVPN has, which is what makes OpenVPN more useful than typical VPN clients. Given that people have implemented all the script and plugin hooks because someone actually *uses* them, taking this away would not be something people like - so you want something that has flexibility, but does not have "full system access" (unix: runs as root). gert -- USENET is *not* the non-clickable part of WWW! //www.muc.de/~gert/ Gert Doering - Munich, Germany ge...@gr... fax: +49-89-35655025 ge...@ne... 

Hi, On Wed, Feb 29, 2012 at 07:43:18PM +0100, Carsten Krüger wrote: > > Part of the assumption here is "the user controls the openvpn config", > > and as such, he can make openvpn.exe run arbitrary scripts anyway - and > > to stop this from being a problem, just run openvpn.exe with your uid. > > What operation could be in script that is usefull when it's executed > in user context. > > I never used script with openvpn. I've no idea which are real world > applications for it. Scripts are for creative uses that the programmers of openvpn have not foreseen. Like "after the VPN is up, auto-sync all your git repositories" or "open up a few xterms with ssh's to $internalhosts". David had some other idea recently, which I forgot. I use scripts for routing table changes on the OpenVPN *server* side (dynamic "route" behaviour). But that's a bad example because it wouldn't work in the "openvpn and all its script childs are not privileged". gert -- USENET is *not* the non-clickable part of WWW! //www.muc.de/~gert/ Gert Doering - Munich, Germany ge...@gr... fax: +49-89-35655025 ge...@ne... 

On Wed, Feb 29, 2012 at 7:38 PM, Alon Bar-Lev <alo...@gm...> wrote: >> However, I'm not terrified of 52 patches to the mailing list.  That's >> definitely doable. > > OK. Well, I sent, not sure all is OK, as I don't see it in archive and some were rejected because of size. At the end of review, please pull from my repository, do not mess with the MIME. Alon. 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- .gitignore | 7 +- _build.bat | 49 +++++++ build.bat | 55 ++++++++ build/MSCV-VSClass3.cer | 29 ++++ build/msvc-generate.js | 118 +++++++++++++++++ build/unix2dos.js | 54 ++++++++ build/vars.amd64.m4 | 2 + build/vars.i386.m4 | 2 + build/zip.js | 74 +++++++++++ config-env.bat.in | 12 ++ configure.bat | 88 +++++++++++++ installer/StrStr.nsi | 47 +++++++ installer/build.bat | 88 +++++++++++++ installer/icon.ico | Bin 0 -> 22486 bytes installer/install-whirl.bmp | Bin 0 -> 25820 bytes installer/tap-windows.nsi | 296 +++++++++++++++++++++++++++++++++++++++++++ src/OemWin2k.inf.in | 187 +++++++++++++++++++++++++++ src/SOURCES.in | 7 +- src/config.h.in | 9 ++ src/error.c | 4 +- src/i386/OemWin2k.inf.in | 195 ---------------------------- src/resource.rc | 8 +- src/tapdrvr.c | 9 +- version.m4 | 11 ++ 24 files changed, 1144 insertions(+), 207 deletions(-) create mode 100644 _build.bat create mode 100644 build.bat create mode 100644 build/MSCV-VSClass3.cer create mode 100644 build/msvc-generate.js create mode 100644 build/unix2dos.js create mode 100644 build/vars.amd64.m4 create mode 100644 build/vars.i386.m4 create mode 100644 build/zip.js create mode 100644 config-env.bat.in create mode 100644 configure.bat create mode 100755 installer/StrStr.nsi create mode 100644 installer/build.bat create mode 100755 installer/icon.ico create mode 100755 installer/install-whirl.bmp create mode 100755 installer/tap-windows.nsi create mode 100755 src/OemWin2k.inf.in create mode 100644 src/config.h.in delete mode 100755 src/i386/OemWin2k.inf.in create mode 100644 version.m4 diff --git a/.gitignore b/.gitignore index 230ee15..f10f92d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,15 @@ *.pdb *.sys *.map +*.cat *.cod +*.exe +*.zip +tmp +config-local.m4 +config-env.bat src/obj* src/amd64 src/i386 src/SOURCES -src/i386/OemWin2k.inf src/config.h diff --git a/_build.bat b/_build.bat new file mode 100644 index 0000000..718feb2 --- /dev/null +++ b/_build.bat @@ -0,0 +1,49 @@ +@echo off +rem TAP-Windows -- A kernel driver to provide virtual tap +rem device functionality on Windows. +rem +rem Copyright (C) 2012 Alon Bar-Lev <alo...@gm...> +rem +rem This program is free software; you can redistribute it and/or modify +rem it under the terms of the GNU General Public License as published by +rem the Free Software Foundation; either version 2 of the License, or +rem (at your option) any later version. +rem +rem This program is distributed in the hope that it will be useful, +rem but WITHOUT ANY WARRANTY; without even the implied warranty of +rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +rem GNU General Public License for more details. +rem +rem You should have received a copy of the GNU General Public License +rem along with this program (see the file COPYING included with this +rem distribution); if not, write to the Free Software Foundation, Inc., +rem 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +setlocal enableextensions enabledelayedexpansion + +set root=%cd% +set myos=%1 +set myprofile=%2 +set mymode=fre + +echo Building %myos%-%myprofile%-%mymode% + +call "%DDK%\bin\setenv" %DDK% %mymode% %myprofile% %myos% no_oacr +if errorlevel 1 goto error + +cd /d %root% +cd src +nmake +if errorlevel 1 goto error + +set rc=0 +goto end + +:error +echo FAIL %myos%-%myprofile%-%mymode% +set rc=1 +goto end + +:end + +endlocal diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..839be8c --- /dev/null +++ b/build.bat @@ -0,0 +1,55 @@ +@echo off +rem TAP-Windows -- A kernel driver to provide virtual tap +rem device functionality on Windows. +rem +rem Copyright (C) 2012 Alon Bar-Lev <alo...@gm...> +rem +rem This program is free software; you can redistribute it and/or modify +rem it under the terms of the GNU General Public License as published by +rem the Free Software Foundation; either version 2 of the License, or +rem (at your option) any later version. +rem +rem This program is distributed in the hope that it will be useful, +rem but WITHOUT ANY WARRANTY; without even the implied warranty of +rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +rem GNU General Public License for more details. +rem +rem You should have received a copy of the GNU General Public License +rem along with this program (see the file COPYING included with this +rem distribution); if not, write to the Free Software Foundation, Inc., +rem 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +cd %0\.. + +if not exist config-env.bat ( +	echo please run configure +	exit /b 1 +) + +setlocal + +call config-env.bat + +for /d %%d in (src\obj*) do rmdir /q /s %%d > nul 2>&1 +for %%f in (src\amd64\*.sys src\i386\*.sys) do del /s %%f > nul 2>&1 + +cmd /c _build WXP x86 +if errorlevel 1 goto error +cmd /c _build WIN7 x64 +if errorlevel 1 goto error + +call installer\build + +set rc=0 +goto end + +:error +echo FAIL +set rc=1 +goto end + +:end + +endlocal + +exit /b %rc% diff --git a/build/MSCV-VSClass3.cer b/build/MSCV-VSClass3.cer new file mode 100644 index 0000000..78eae54 --- /dev/null +++ b/build/MSCV-VSClass3.cer @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIFAzCCAuugAwIBAgIKYQwSBgAAAAAAGzANBgkqhkiG9w0BAQUFADB/MQswCQYD +VQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEe +MBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSkwJwYDVQQDEyBNaWNyb3Nv +ZnQgQ29kZSBWZXJpZmljYXRpb24gUm9vdDAeFw0wNjA1MjMxNzAxMjlaFw0xNjA1 +MjMxNzExMjlaMF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5j +LjE3MDUGA1UECxMuQ2xhc3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9u +IEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyVxZnvIbigEU +tBDfBEDb41evakVAj4QMC9Ez2dkRz+4CWB8l9yqoRAWq7AMfeH+ek7maAKojfdas +haJjRcdyJ8z0TMZ1cdI5709C8HXfCpDGjiBvmA/4rCNfcCk2pMmG57GaIMtTpYXn +Pb59mv4kRTPcdhXtD6JxZExlLoFoRacCAwEAAaOCASMwggEfMBEGA1UdIAQKMAgw +BgYEVR0gADA2BgkrBgEEAYI3FQcEKTAnBh8rBgEEAYI3FQiN4NGJToTXnMMHhqaG ++xyP07+mFQEZAgFuAgEAMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0G +A1UdDgQWBBTif3vYd9Xfngo/nrTLDi6p79tpdzAdBgkrBgEEAYI3FAIEEB4OAEMA +cgBvAHMAcwBDAEEwHwYDVR0jBBgwFoAUYvsKIVt/Q24R2glUUGv10pZx8Z4wVQYD +VR0fBE4wTDBKoEigRoZEaHR0cDovL2NybC5taWNyb3NvZnQuY29tL3BraS9jcmwv +cHJvZHVjdHMvTWljcm9zb2Z0Q29kZVZlcmlmUm9vdC5jcmwwDQYJKoZIhvcNAQEF +BQADggIBAAHkRrM7RX91E4d+X0PeRo7Lir22R0G8zMx0kdjOOVGVpKa1R8Dv0tp7 +j1cR9DKMfM0/7kLaBCFK98hDiEpvXMoU/EvRn0y91FVuzAK+DaaIj4YJuqQlveiw +8PqLcU5nsMuCqNeOVfc36/A+iO/k4Ir9HG4uYUFIdbSwLB0o2EkP1xXwJHMlPMyI +DN4oTGVU/l6ujOoZrSxRsps6R/U8gDUBF+JJh9ZUSvtLqwe8v315z781AFy7ns/8 +gokbOaBRl7bewLMH/0SWRMA0Khlcq+7wO+wpTrUTxTeFfnXVtNYNBm610mwjcWfq +8XGOr050qgz57L9MWPpekJttOcuGiD+LHKgWMtX+bbnx+LPq15H2Nkd4wCcqFcdo +1vTF/E9OyGc/EC1An/EeyWFI56cD/DFzDPBGiP5W2kkple8J2qPlvu9g7NlUoFmc +KL1U72YVf4dMhNumDpVnLlF7NDm2QcKMhGgm3CQCCeeBjgqXLe/up7mYpg+BjccQ +teHtmC9Ib1OFSWR4m+xdrJcLVSbD77qNyNGlL1p/k2thGjObGLiiYhDeJOp24S9D +6+zdfBI0JInaKFWu5XVOMStnY7ao16tzCgPOxepZP8frKkWuqGJbLwCZOau0X3PD +COyAEY9HDo8qE0PhkQZiVbv/uj2pqT0mD67KfWKLFVWJ1pQ0TdZl +-----END CERTIFICATE----- diff --git a/build/msvc-generate.js b/build/msvc-generate.js new file mode 100644 index 0000000..d9564cf --- /dev/null +++ b/build/msvc-generate.js @@ -0,0 +1,118 @@ +/* + * msvc-generate.js - string transformation + * + * Copyright (C) 2008-2012 Alon Bar-Lev <alo...@gm...> + * + * BSD License + * ============ + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * o Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o Neither the name of the Alon Bar-Lev nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ + +var ForReading = 1; +var fso = new ActiveXObject("Scripting.FileSystemObject"); +var input = "nul"; +var output = "nul"; +var files = new Array(); +var env = new Array(); + +function initialize() { +	for (var i=0;i<WScript.Arguments.length;i++) { +	var arg = WScript.Arguments(i); +	if (arg.match(/^--input=(.*)$/)) { +	input=RegExp.$1; +	} +	else if (arg.match(/^--output=(.*)$/)) { +	output=RegExp.$1; +	} +	else if (arg.match(/^--config=(.*)$/)) { +	files.push(RegExp.$1); +	} +	else if (arg.match(/^--var=([^=]*)=(.*)$/)) { +	env[RegExp.$1] = RegExp.$2; +	} +	} +} + +function process_config(vars, file) { +	try { +	var fin = fso.OpenTextFile(file, ForReading); + +	while (!fin.AtEndOfStream) { +	var content = fin.ReadLine(); +	if (content.match(/^[ \t]*define\(\[(.*)\],[ \t]*\[(.*)\]\)[ \t]*/)) { +	vars[RegExp.$1] = RegExp.$2; +	} +	} +	} +	catch(e) { +	throw new Error(1, "Cannot process '" + file + "'."); +	} +} + +function process_file(vars, input, output) { +	var fin = fso.OpenTextFile(input, ForReading); +	var fout = fso.CreateTextFile(output); +	var content = fin.ReadAll(); + +	for (var i in vars) { +	content = content.replace(new RegExp("@"+i+"@", "g"), vars[i]); +	} + +	fout.Write(content); +} + +function build_vars() { +	var vars = new Array(); +	for (var f in files) { +	process_config(vars, files[f]); +	} +	for (var e in env) { +	vars[e] = env[e]; +	} +	return vars; +} + +function main() { +	try { +	initialize(); + +	var vars = build_vars(); + +	process_file( +	vars, +	input, +	output +	); + +	WScript.Quit(0); +	} +	catch(e) { +	WScript.Echo("ERROR: when procssing " + output + ": " + e.description); +	WScript.Quit(1); +	} +} + +main(); diff --git a/build/unix2dos.js b/build/unix2dos.js new file mode 100644 index 0000000..51ee7c9 --- /dev/null +++ b/build/unix2dos.js @@ -0,0 +1,54 @@ +/* + * unix2dos.js - a simple unix2dos implementation in jscript. + * + * Copyright (C) 2008-2012 Alon Bar-Lev <alo...@gm...> + * + * BSD License + * ============ + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * o Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o Neither the name of the Alon Bar-Lev nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ + +var ForReading = 1; + +try { +	var fso = new ActiveXObject("Scripting.FileSystemObject"); +	for (var i=0;i<WScript.Arguments.length;i++) { +	var file = WScript.Arguments(i); +	var tmp = file+".tmp"; +	var fin = fso.OpenTextFile(file, ForReading); +	var fout = fso.CreateTextFile(tmp); +	fout.Write(fin.ReadAll().replace(/\n/g, "\r\n")); +	fin.Close(); +	fout.Close(); +	fso.DeleteFile(file); +	fso.MoveFile(tmp, file); +	} +	WScript.Quit(0); +} +catch(e) { +	WScript.Echo("ERROR: " + e.description); +	WScript.Quit(1); +} diff --git a/build/vars.amd64.m4 b/build/vars.amd64.m4 new file mode 100644 index 0000000..2613250 --- /dev/null +++ b/build/vars.amd64.m4 @@ -0,0 +1,2 @@ +define([INF_PROVIDER_SUFFIX], [, NTamd64]) +define([INF_SECTION_SUFFIX], [.NTamd64]) diff --git a/build/vars.i386.m4 b/build/vars.i386.m4 new file mode 100644 index 0000000..9bd4d31 --- /dev/null +++ b/build/vars.i386.m4 @@ -0,0 +1,2 @@ +define([INF_PROVIDER_SUFFIX], []) +define([INF_SECTION_SUFFIX], []) diff --git a/build/zip.js b/build/zip.js new file mode 100644 index 0000000..6550d8a --- /dev/null +++ b/build/zip.js @@ -0,0 +1,74 @@ +/* + * zip.js - a simple zip implementation in jscript. + * + * Copyright (C) 2008-2012 Alon Bar-Lev <alo...@gm...> + * + * BSD License + * ============ + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * o Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * o Neither the name of the Alon Bar-Lev nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ + +var ForReading = 0; +var ForWriting = 1; +var fso = new ActiveXObject("Scripting.FileSystemObject"); + +function zip(source, destination) { +	try { +	var f = OpenTextFile(destination, ForReading); +	f.Close(); +	} +	catch(e) { +	var f = fso.CreateTextFile(destination, ForWriting); +	var zipheader = "PK" + String.fromCharCode(5) + String.fromCharCode(6); +	for (var i=0;i<18;i++) { +	zipheader += String.fromCharCode(0); +	} +	f.Write(zipheader); +	f.Close(); +	} + +	var shell = new ActiveXObject("Shell.Application"); +	var source = shell.NameSpace(fso.GetAbsolutePathName(source)); +	var destination = shell.NameSpace(fso.GetAbsolutePathName(destination)); + +	destination.CopyHere(source.Items(), 4); +	while(source.Items().Count != destination.Items().Count) { +	WScript.Sleep(1000); +	} +} + +var index = 0; +var source = WScript.Arguments(index++); +var destination = WScript.Arguments(index++); +try { +	zip(source, destination); +	WScript.Quit(0); +} +catch(e) { +	WScript.Echo("ERROR: Cannot zip '" + destination + "'."); +	WScript.Quit(1); +} + diff --git a/config-env.bat.in b/config-env.bat.in new file mode 100644 index 0000000..ed38c15 --- /dev/null +++ b/config-env.bat.in @@ -0,0 +1,12 @@ +set DDK=@DDK@ +set DEVCON32=@DEVCON32@ +set DEVCON64=@DEVCON64@ +set DEVCON_BASENAME=@DEVCON_BASENAME@ +set SIGNTOOL=@SIGNTOOL@ +set MAKENSIS=@MAKENSIS@ +set CODESIGN_PKCS12=@CODESIGN_PKCS12@ +set CODESIGN_PASS=@CODESIGN_PASS@ +set PRODUCT_TAP_WIN_COMPONENT_ID=@PRODUCT_TAP_WIN_COMPONENT_ID@ +set PRODUCT_NAME=@PRODUCT_NAME@ +set PRODUCT_VERSION=@PRODUCT_VERSION@ +set OUTDIR=@OUTDIR@ diff --git a/configure.bat b/configure.bat new file mode 100644 index 0000000..8673d5a --- /dev/null +++ b/configure.bat @@ -0,0 +1,88 @@ +@echo off +rem TAP-Windows -- A kernel driver to provide virtual tap +rem device functionality on Windows. +rem +rem Copyright (C) 2012 Alon Bar-Lev <alo...@gm...> +rem +rem This program is free software; you can redistribute it and/or modify +rem it under the terms of the GNU General Public License as published by +rem the Free Software Foundation; either version 2 of the License, or +rem (at your option) any later version. +rem +rem This program is distributed in the hope that it will be useful, +rem but WITHOUT ANY WARRANTY; without even the implied warranty of +rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +rem GNU General Public License for more details. +rem +rem You should have received a copy of the GNU General Public License +rem along with this program (see the file COPYING included with this +rem distribution); if not, write to the Free Software Foundation, Inc., +rem 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +cd %0\.. + +if "%1"=="--help" ( +	echo %0 +	echo Environment: +	echo DDK DDK home +	echo SIGNTOOL signtool, default from DDK +	echo DEVCON32 devcon, default from DDK +	echo DEVCON64 devcon, default from DDK +	echo MAKENSIS nullsoft installer +	echo CODESIGN_PKCS12 Code sign PKCS#12 optional +	echo CODESIGN_PASS Code sign password +	echo OUTDIR Output directory +	exit /b 1 +) + +setlocal + +if "%DDK%"=="" for /d %%f in (c:\WINDDK\*) do set DDK=%%f + +if "%DDK%"=="" ( +	echo cannot find ddk +	goto error +) + +if "%SIGNTOOL%"=="" set SIGNTOOL=%DDK%\bin\x86\signtool.exe +if "%DEVCON32%"=="" set DEVCON32=%DDK%\tools\devcon\i386\devcon.exe +if "%DEVCON64%"=="" set DEVCON64=%DDK%\tools\devcon\amd64\devcon.exe +for /f %%f in ("%DEVCON32%") do set DEVCON_BASENAME=%%~nf%%~xf + +if "%MAKENSIS%"=="" for /d %%f in ("%ProgramFiles%\NSIS" "%ProgramFiles(x86)%\NSIS") do if exist "%%f" set MAKENSIS=%%~f + +if "%MAKENSIS%"=="" ( +	echo cannot find nsis +	goto error +) + +if "%OUTDIR%"=="" set OUTDIR=%cd% + +set msvcg_args=cscript //nologo build/msvc-generate.js --config=version.m4 +if exist config-local.m4 set msvcg_args=%msvcg_args% --config=config-local.m4 +set msvcg_args=%msvcg_args% --var=DDK="%DDK%" --var=MAKENSIS="%MAKENSIS%" --var=SIGNTOOL="%SIGNTOOL%" --var=DEVCON32="%DEVCON32%" --var=DEVCON64="%DEVCON64%" --var=DEVCON_BASENAME="%DEVCON_BASENAME%" --var=EXTRA_C_DEFINES="%EXTRA_C_DEFINES%" --var=CODESIGN_PKCS12="%CODESIGN_PKCS12%" --var=CODESIGN_PASS="%CODESIGN_PASS%" --var=OUTDIR="%OUTDIR%" + +for %%f in (config-env.bat src\SOURCES src\config.h) do ( +	%msvcg_args% --input=%%f.in --output=%%f +	if errorlevel 1 goto error +) + +for %%a in (i386 amd64) do ( +	mkdir src\%%a > nul 2>&1 +	%msvcg_args% --config=build\vars.%%a.m4 --input=src\OemWin2k.inf.in --output=src\%%a\OemWin2k.inf +	if errorlevel 1 goto error +) + +set rc=0 +goto end + +:error +echo FAILED +set rc=1 +goto end + +:end + +endlocal + +exit /b %rc% diff --git a/installer/StrStr.nsi b/installer/StrStr.nsi new file mode 100755 index 0000000..0bad0f2 --- /dev/null +++ b/installer/StrStr.nsi @@ -0,0 +1,47 @@ +;==================================================== +; StrStr - Finds a given string in another given string. +; Returns -1 if not found and the pos if found. +; Input: head of the stack - string to find +; second in the stack - string to find in +; Output: head of the stack +;==================================================== +!macro StrStr un +Function ${un}StrStr + Push $0 + Exch + Pop $0 ; $0 now have the string to find + Push $1 + Exch 2 + Pop $1 ; $1 now have the string to find in + Exch + Push $2 + Push $3 + Push $4 + Push $5 + + StrCpy $2 -1 + StrLen $3 $0 + StrLen $4 $1 + IntOp $4 $4 - $3 + + StrStr_loop: + IntOp $2 $2 + 1 + IntCmp $2 $4 0 0 StrStrReturn_notFound + StrCpy $5 $1 $3 $2 + StrCmp $5 $0 StrStr_done StrStr_loop + + StrStrReturn_notFound: + StrCpy $2 -1 + + StrStr_done: + Pop $5 + Pop $4 + Pop $3 + Exch $2 + Exch 2 + Pop $0 + Pop $1 +FunctionEnd +!macroend +!insertmacro StrStr "" +;!insertmacro StrStr "un." diff --git a/installer/build.bat b/installer/build.bat new file mode 100644 index 0000000..79405b5 --- /dev/null +++ b/installer/build.bat @@ -0,0 +1,88 @@ +@echo off +rem TAP-Windows -- A kernel driver to provide virtual tap +rem device functionality on Windows. +rem +rem Copyright (C) 2012 Alon Bar-Lev <alo...@gm...> +rem +rem This program is free software; you can redistribute it and/or modify +rem it under the terms of the GNU General Public License as published by +rem the Free Software Foundation; either version 2 of the License, or +rem (at your option) any later version. +rem +rem This program is distributed in the hope that it will be useful, +rem but WITHOUT ANY WARRANTY; without even the implied warranty of +rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +rem GNU General Public License for more details. +rem +rem You should have received a copy of the GNU General Public License +rem along with this program (see the file COPYING included with this +rem distribution); if not, write to the Free Software Foundation, Inc., +rem 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +setlocal + +set wd=%cd% +cd %0\.. + +if "%MAKENSIS%"=="" call ..\config-env.bat + +if "%OUTDIR%"=="" set OUTDIR=. +set OUTPUT=%OUTDIR%\tap-windows-%PRODUCT_VERSION% +set TAP_ROOT=tmp\image\tap-windows-%PRODUCT_VERSION% + +del "%OUTPUT%.*" > nul 2>&1 +rmdir /q /s tmp > nul 2>&1 + +mkdir %TAP_ROOT%\include +copy ..\src\tap-windows.h %TAP_ROOT%\include +if errorlevel 1 goto error +mkdir %TAP_ROOT%\i386 +copy ..\src\i386\* %TAP_ROOT%\i386 +if errorlevel 1 goto error +mkdir %TAP_ROOT%\amd64 +copy ..\src\amd64\* %TAP_ROOT%\amd64 +if errorlevel 1 goto error + +type ..\COPYING > %TAP_ROOT%\license.txt +type ..\COPYRIGHT.GPL >> %TAP_ROOT%\license.txt +cscript //nologo ..\build\unix2dos.js %TAP_ROOT%\license.txt +if errorlevel 1 goto error + +"%DDK%\bin\selfsign\inf2cat" /driver:%TAP_ROOT%\i386 /os:XP_X86,Vista_X86,7_X86,Server2003_X86,Server2008_X86 +"%DDK%\bin\selfsign\inf2cat" /driver:%TAP_ROOT%\amd64 /os:XP_X64,Vista_X64,7_X64,Server2003_X64,Server2008_X64,Server2008R2_X64 + +if not "%CODESIGN_PKCS12%"=="" ( +	for %%a in (i386 amd64) do ( +	"%SIGNTOOL%" sign /v /p "%CODESIGN_PASS%" /f "%CODESIGN_PKCS12%" /ac ..\build\MSCV-VSClass3.cer /t http://timestamp.verisign.com/scripts/timestamp.dll "%TAP_ROOT%\%%a\%PRODUCT_TAP_WIN_COMPONENT_ID%.sys" +	"%SIGNTOOL%" sign /v /p "%CODESIGN_PASS%" /f "%CODESIGN_PKCS12%" /ac ..\build\MSCV-VSClass3.cer /t http://timestamp.verisign.com/scripts/timestamp.dll "%TAP_ROOT%\%%a\%PRODUCT_TAP_WIN_COMPONENT_ID%.cat" +	if errorlevel 1 goto error +	) +) + +cscript //nologo ..\build\zip.js tmp\image "%OUTPUT%.zip" +if errorlevel 1 goto error + +"%MAKENSIS%\makensis" -DDEVCON32="%DEVCON32%" -DDEVCON64="%DEVCON64%" -DDEVCON_BASENAME="%DEVCON_BASENAME%" -DPRODUCT_TAP_WIN_COMPONENT_ID="%PRODUCT_TAP_WIN_COMPONENT_ID%" -DPRODUCT_NAME="%PRODUCT_NAME%" -DPRODUCT_VERSION="%PRODUCT_VERSION%" -DOUTPUT="%OUTPUT%.exe" -DIMAGE="%TAP_ROOT%" tap-windows.nsi +if errorlevel 1 goto error + +if not "%CODESIGN_PKCS12%"=="" ( +	"%SIGNTOOL%" sign /v /p "%CODESIGN_PASS%" /f "%CODESIGN_PKCS12%" /t http://timestamp.verisign.com/scripts/timestamp.dll "%OUTPUT%.exe" +	if errorlevel 1 goto error +	) +) + +set rc=0 +goto end + +:error +echo FATAL +set rc=1 +goto end + +:end + +cd %wd% + +endlocal + +exit /b %rc% diff --git a/installer/icon.ico b/installer/icon.ico new file mode 100755 index 0000000000000000000000000000000000000000..03ea0b1dccf355d4f5ac877c0918b374c7b7c4ee GIT binary patch literal 22486 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 literal 0 HcmV?d00001 diff --git a/installer/install-whirl.bmp b/installer/install-whirl.bmp new file mode 100755 index 0000000000000000000000000000000000000000..03f33fce96789420beb692679093506ca0685469 GIT binary patch literal 25820 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 literal 0 HcmV?d00001 diff --git a/installer/tap-windows.nsi b/installer/tap-windows.nsi new file mode 100755 index 0000000..26e060b --- /dev/null +++ b/installer/tap-windows.nsi @@ -0,0 +1,296 @@ +; **************************************************************************** +; * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. * +; * Copyright (C) 2012 Alon Bar-Lev <alo...@gm...> * +; * This program is free software; you can redistribute it and/or modify * +; * it under the terms of the GNU General Public License version 2 * +; * as published by the Free Software Foundation. * +; **************************************************************************** + +; TAP-Windows install script for Windows, using NSIS + +SetCompressor lzma + +!include "MUI.nsh" + +!include "StrStr.nsi" + +;-------------------------------- +;Configuration + +;General + +OutFile "${OUTPUT}" + +ShowInstDetails show +ShowUninstDetails show + +;Folder selection page +InstallDir "$PROGRAMFILES\${PRODUCT_NAME}" + +;Remember install folder +InstallDirRegKey HKCU "Software\${PRODUCT_NAME}" "" + +;-------------------------------- +;Modern UI Configuration + +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" + +!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of ${PRODUCT_NAME}, an Open Source VPN package by James Yonan.\r\n\r\nNote that the Windows version of ${PRODUCT_NAME} will only run on Win 2000, XP, or higher.\r\n\r\n\r\n" + +!define MUI_COMPONENTSPAGE_TEXT_TOP "Select the components to install/upgrade. Stop any ${PRODUCT_NAME} processes or the ${PRODUCT_NAME} service if it is running. All DLLs are installed locally." + +!define MUI_COMPONENTSPAGE_SMALLDESC +!define MUI_FINISHPAGE_NOAUTOCLOSE +!define MUI_ABORTWARNING +!define MUI_ICON "icon.ico" +!define MUI_UNICON "icon.ico" +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP "install-whirl.bmp" +!define MUI_UNFINISHPAGE_NOAUTOCLOSE + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "${IMAGE}\license.txt" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +;-------------------------------- +;Languages + +!insertmacro MUI_LANGUAGE "English" + +;-------------------------------- +;Language Strings + +LangString DESC_SecTAP ${LANG_ENGLISH} "Install/Upgrade the TAP virtual device driver. Will not interfere with CIPE." +LangString DESC_SecTAPSDK ${LANG_ENGLISH} "Install the TAP SDK." + +;-------------------------------- +;Reserve Files + +;Things that need to be extracted on first (keep these lines before any File command!) +;Only useful for BZIP2 compression + +ReserveFile "install-whirl.bmp" + +;-------------------------------- +;Macros + +!macro IsAdmin +	UserInfo::GetName +	${Unless} ${Errors} +	Pop $R0 +	UserInfo::GetAccountType +	Pop $R1 +	${If} $R1 != "Admin" +	Messagebox MB_OK "Administrator privileges required to install/uninstall ${PRODUCT_NAME} [$R0/$R1]" +	Abort +	${EndIf} +	${EndUnlesS} +!macroend + +;------------------------------------------ +;Set reboot flag based on tapinstall return + +Function CheckReboot +	${If} $R0 == "" +	IntOp $R0 0 & 0 +	SetRebootFlag true +	DetailPrint "REBOOT flag set" +	${EndIf} +FunctionEnd + +;-------------------------------- +;Installer Sections + +Function .onInit +	ClearErrors +	!insertmacro IsAdmin + +	# Delete previous start menu +	RMDir /r $SMPROGRAMS\${PRODUCT_NAME} + +FunctionEnd + +Section "TAP Virtual Ethernet Adapter" SecTAP + +	SetOverwrite on + +	FileOpen $R0 "$INSTDIR\bin\addtap.bat" w +	FileWrite $R0 "rem Add a new TAP virtual ethernet adapter$\r$\n" +	FileWrite $R0 '"$INSTDIR\bin\${DEVCON_BASENAME}" install "$INSTDIR\driver\OemWin2k.inf" ${PRODUCT_TAP_WIN_COMPONENT_ID}$\r$\n' +	FileWrite $R0 "pause$\r$\n" +	FileClose $R0 + +	FileOpen $R0 "$INSTDIR\bin\deltapall.bat" w +	FileWrite $R0 "echo WARNING: this script will delete ALL TAP virtual adapters (use the device manager to delete adapters one at a time)$\r$\n" +	FileWrite $R0 "pause$\r$\n" +	FileWrite $R0 '"$INSTDIR\bin\${DEVCON_BASENAME}" remove ${PRODUCT_TAP_WIN_COMPONENT_ID}$\r$\n' +	FileWrite $R0 "pause$\r$\n" +	FileClose $R0 + +	; Check if we are running on a 64 bit system. +	System::Call "kernel32::GetCurrentProcess() i .s" +	System::Call "kernel32::IsWow64Process(i s, *i .R0)" +	${If} $R0 != 0 +	; tap-64bit: +	DetailPrint "We are running on a 64-bit system." + +	SetOutPath "$INSTDIR\bin" +	File "${DEVCON64}" + +	SetOutPath "$INSTDIR\driver" +	File "${IMAGE}\amd64\OemWin2k.inf" +	File "${IMAGE}\amd64\${PRODUCT_TAP_WIN_COMPONENT_ID}.cat" +	File "${IMAGE}\amd64\${PRODUCT_TAP_WIN_COMPONENT_ID}.sys" +	${Else} +	; tap-32bit +	DetailPrint "We are running on a 32-bit system." + +	SetOutPath "$INSTDIR\bin" +	File "${DEVCON32}" + +	SetOutPath "$INSTDIR\driver" +	File "${IMAGE}\i386\OemWin2k.inf" +	File "${IMAGE}\i386\${PRODUCT_TAP_WIN_COMPONENT_ID}.cat" +	File "${IMAGE}\i386\${PRODUCT_TAP_WIN_COMPONENT_ID}.sys" +	${EndIf} +SectionEnd + +Section /o "TAP SDK" SecTAPSDK +	SetOverwrite on +	SetOutPath "$INSTDIR\include" +	File "${IMAGE}\include\tap-windows.h" +SectionEnd + +;-------------------- +;Post-install section + +Section -post + +	SetOverwrite on + +	; Store README, license, icon +	SetOverwrite on +	SetOutPath $INSTDIR +	File "${IMAGE}\license.txt" +	File "icon.ico" + +	${If} ${SectionIsSelected} ${SecTAP} +	; +	; install/upgrade TAP driver if selected, using devcon +	; +	; TAP install/update was selected. +	; Should we install or update? +	; If tapinstall error occurred, $R5 will +	; be nonzero. +	IntOp $R5 0 & 0 +	nsExec::ExecToStack '"$INSTDIR\bin\${DEVCON_BASENAME}" hwids ${PRODUCT_TAP_WIN_COMPONENT_ID}' +	Pop $R0 # return value/error/timeout +	IntOp $R5 $R5 | $R0 +	DetailPrint "${DEVCON_BASENAME} hwids returned: $R0" + +	; If tapinstall output string contains "${PRODUCT_TAP_WIN_COMPONENT_ID}" we assume +	; that TAP device has been previously installed, +	; therefore we will update, not install. +	Push "${PRODUCT_TAP_WIN_COMPONENT_ID}" +	Call StrStr +	Pop $R0 + +	${If} $R5 == 0 +	${If} $R0 == -1 +	DetailPrint "TAP INSTALL (${PRODUCT_TAP_WIN_COMPONENT_ID})" +	nsExec::ExecToLog '"$INSTDIR\bin\${DEVCON_BASENAME}" install "$INSTDIR\driver\OemWin2k.inf" ${PRODUCT_TAP_WIN_COMPONENT_ID}' +	Pop $R0 # return value/error/timeout +	Call CheckReboot +	IntOp $R5 $R5 | $R0 +	DetailPrint "${DEVCON_BASENAME} install returned: $R0" +	${Else} +	DetailPrint "TAP UPDATE" +	nsExec::ExecToLog '"$INSTDIR\bin\${DEVCON_BASENAME}" update "$INSTDIR\driver\OemWin2k.inf" ${PRODUCT_TAP_WIN_COMPONENT_ID}' +	Pop $R0 # return value/error/timeout +	Call CheckReboot +	IntOp $R5 $R5 | $R0 +	DetailPrint "${DEVCON_BASENAME} update returned: $R0" +	${EndIf} +	${EndIf} + +	DetailPrint "${DEVCON_BASENAME} cumulative status: $R5" +	${If} $R5 != 0 +	MessageBox MB_OK "An error occurred installing the TAP device driver." +	${EndIf} + +	; Store install folder in registry +	WriteRegStr HKLM SOFTWARE\${PRODUCT_NAME} "" $INSTDIR + +	; Create shortcuts +	CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Utilities\Add a new TAP virtual ethernet adapter.lnk" "$INSTDIR\bin\addtap.bat" "" +	CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Utilities\Delete ALL TAP virtual ethernet adapters.lnk" "$INSTDIR\bin\deltapall.bat" "" +	${EndIf} + +	; Create uninstaller +	WriteUninstaller "$INSTDIR\Uninstall.exe" + +	; Show up in Add/Remove programs +	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME} ${PRODUCT_VERSION}" +	WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" "$INSTDIR\Uninstall.exe" +	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$INSTDIR\icon.ico" +	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${PRODUCT_VERSION}" + +	; Advise a reboot +	;Messagebox MB_OK "IMPORTANT: Rebooting the system is advised in order to finalize TAP driver installation/upgrade (this is an informational message only, pressing OK will not reboot)." + +SectionEnd + +;-------------------------------- +;Descriptions + +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN +!insertmacro MUI_DESCRIPTION_TEXT ${SecTAP} $(DESC_SecTAP) +!insertmacro MUI_DESCRIPTION_TEXT ${SecTAPSDK} $(DESC_SecTAPSDK) +!insertmacro MUI_FUNCTION_DESCRIPTION_END + +;-------------------------------- +;Uninstaller Section + +Function un.onInit +	ClearErrors +	!insertmacro IsAdmin +FunctionEnd + +Section "Uninstall" +	DetailPrint "TAP REMOVE" +	nsExec::ExecToLog '"$INSTDIR\bin\${DEVCON_BASENAME}" remove ${PRODUCT_TAP_WIN_COMPONENT_ID}' +	Pop $R0 # return value/error/timeout +	DetailPrint "${DEVCON_BASENAME} remove returned: $R0" + +	Delete "$INSTDIR\bin\${DEVCON_BASENAME}" +	Delete "$INSTDIR\bin\addtap.bat" +	Delete "$INSTDIR\bin\deltapall.bat" + +	Delete "$INSTDIR\driver\OemWin2k.inf" +	Delete "$INSTDIR\driver\${PRODUCT_TAP_WIN_COMPONENT_ID}.cat" +	Delete "$INSTDIR\driver\${PRODUCT_TAP_WIN_COMPONENT_ID}.sys" + +	Delete "$INSTDIR\include\tap-windows.h" + +	Delete "$INSTDIR\icon.ico" +	Delete "$INSTDIR\license.txt" +	Delete "$INSTDIR\Uninstall.exe" + +	RMDir "$INSTDIR\bin" +	RMDir "$INSTDIR\driver" +	RMDir "$INSTDIR\include" +	RMDir "$INSTDIR" + +	DeleteRegKey HKCR "${PRODUCT_NAME}File" +	DeleteRegKey HKLM "SOFTWARE\${PRODUCT_NAME}" +	DeleteRegKey HKCU "Software\${PRODUCT_NAME}" +	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" + +SectionEnd diff --git a/src/OemWin2k.inf.in b/src/OemWin2k.inf.in new file mode 100755 index 0000000..ef73600 --- /dev/null +++ b/src/OemWin2k.inf.in @@ -0,0 +1,187 @@ +; **************************************************************************** +; * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. * +; * This program is free software; you can redistribute it and/or modify * +; * it under the terms of the GNU General Public License version 2 * +; * as published by the Free Software Foundation. * +; **************************************************************************** + +; SYNTAX CHECKER +; cd \WINDDK\3790\tools\chkinf +; chkinf c:\src\openvpn\tap-win32\i386\oemwin2k.inf +; OUTPUT -> file:///c:/WINDDK/3790/tools/chkinf/htm/c%23+src+openvpn+tap-win32+i386+__OemWin2k.htm + +; INSTALL/REMOVE DRIVER +; tapinstall install OemWin2k.inf TAP0901 +; tapinstall update OemWin2k.inf TAP0901 +; tapinstall remove TAP0901 + +;********************************************************* +; Note to Developers: +; +; If you are bundling the TAP-Windows driver with your app, +; you should try to rename it in such a way that it will +; not collide with other instances of TAP-Windows defined +; by other apps. Multiple versions of the TAP-Windows +; driver, each installed by different apps, can coexist +; on the same machine if you follow these guidelines. +; NOTE: these instructions assume you are editing the +; generated OemWin2k.inf file, not the source +; OemWin2k.inf.in file which is preprocessed by winconfig +; and uses macro definitions from settings.in. +; +; (1) Rename all tapXXXX instances in this file to +; something different (use at least 5 characters +; for this name!) +; (2) Change the "!define TAP" definition in openvpn.nsi +; to match what you changed tapXXXX to. +; (3) Change TARGETNAME in SOURCES to match what you +; changed tapXXXX to. +; (4) Change TAP_COMPONENT_ID in common.h to match what +; you changed tapXXXX to. +; (5) Change SZDEPENDENCIES in service.h to match what +; you changed tapXXXX to. +; (6) Change DeviceDescription and Provider strings. +; (7) Change PRODUCT_TAP_WIN_DEVICE_DESCRIPTION in constants.h to what you +; set DeviceDescription to. +; +;********************************************************* + +[Version] + Signature = "$Windows NT$" + CatalogFile = @PRODUCT_TAP_WIN_COMPONENT_ID@.cat + ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} + Provider = %Provider% + Class = Net + +; This version number should match the version +; number given in SOURCES. + DriverVer=@PRODUCT_TAP_WIN_RELDATE@,@PRODUCT_TAP_WIN_MAJOR@.00.00.@PRODUCT_TAP_WIN_MINOR@ + +[Strings] + DeviceDescription = "@PRODUCT_TAP_WIN_DEVICE_DESCRIPTION@" + Provider = "@PRODUCT_TAP_WIN_PROVIDER@" + +;---------------------------------------------------------------- +; Manufacturer + Product Section (Done) +;---------------------------------------------------------------- +[Manufacturer] + %Provider% = @PRODUCT_TAP_WIN_COMPONENT_ID@@INF_PROVIDER_SUFFIX@ + +[@PRODUCT_TAP_WIN_COMPONENT_ID@@INF_SECTION_SUFFIX@] + %DeviceDescription% = @PRODUCT_TAP_WIN_COMPONENT_ID@.ndi, @PRODUCT_TAP_WIN_COMPONENT_ID@ + +;--------------------------------------------------------------- +; Driver Section (Done) +;--------------------------------------------------------------- + +;----------------- Characteristics ------------ +; NCF_PHYSICAL = 0x04 +; NCF_VIRTUAL = 0x01 +; NCF_SOFTWARE_ENUMERATED = 0x02 +; NCF_HIDDEN = 0x08 +; NCF_NO_SERVICE = 0x10 +; NCF_HAS_UI = 0x80 +;----------------- Characteristics ------------ + +[@PRODUCT_TAP_WIN_COMPONENT_ID@.ndi] + CopyFiles = @PRODUCT_TAP_WIN_COMPONENT_ID@.driver, @PRODUCT_TAP_WIN_COMPONENT_ID@.files + AddReg = @PRODUCT_TAP_WIN_COMPONENT_ID@.reg + AddReg = @PRODUCT_TAP_WIN_COMPONENT_ID@.params.reg + Characteristics = @PRODUCT_TAP_WIN_CHARACTERISTICS@ + +[@PRODUCT_TAP_WIN_COMPONENT_ID@.ndi.Services] + AddService = @PRODUCT_TAP_WIN_COMPONENT_ID@, 2, @PRODUCT_TAP_WIN_COMPONENT_ID@.service + +[@PRODUCT_TAP_WIN_COMPONENT_ID@.reg] + HKR, Ndi, Service, 0, "@PRODUCT_TAP_WIN_COMPONENT_ID@" + HKR, Ndi\Interfaces, UpperRange, 0, "ndis5" + HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" + HKR, , Manufacturer, 0, "%Provider%" + HKR, , ProductName, 0, "%DeviceDescription%" + +[@PRODUCT_TAP_WIN_COMPONENT_ID@.params.reg] + HKR, Ndi\params\MTU, ParamDesc, 0, "MTU" + HKR, Ndi\params\MTU, Type, 0, "int" + HKR, Ndi\params\MTU, Default, 0, "1500" + HKR, Ndi\params\MTU, Optional, 0, "0" + HKR, Ndi\params\MTU, Min, 0, "100" + HKR, Ndi\params\MTU, Max, 0, "1500" + HKR, Ndi\params\MTU, Step, 0, "1" + HKR, Ndi\params\MediaStatus, ParamDesc, 0, "Media Status" + HKR, Ndi\params\MediaStatus, Type, 0, "enum" + HKR, Ndi\params\MediaStatus, Default, 0, "0" + HKR, Ndi\params\MediaStatus, Optional, 0, "0" + HKR, Ndi\params\MediaStatus\enum, "0", 0, "Application Controlled" + HKR, Ndi\params\MediaStatus\enum, "1", 0, "Always Connected" + HKR, Ndi\params\MAC, ParamDesc, 0, "MAC Address" + HKR, Ndi\params\MAC, Type, 0, "edit" + HKR, Ndi\params\MAC, Optional, 0, "1" + HKR, Ndi\params\AllowNonAdmin, ParamDesc, 0, "Non-Admin Access" + HKR, Ndi\params\AllowNonAdmin, Type, 0, "enum" + HKR, Ndi\params\AllowNonAdmin, Default, 0, "1" + HKR, Ndi\params\AllowNonAdmin, Optional, 0, "0" + HKR, Ndi\params\AllowNonAdmin\enum, "0", 0, "Not Allowed" + HKR, Ndi\params\AllowNonAdmin\enum, "1", 0, "Allowed" + +;---------------------------------------------------------------- +; Service Section +;---------------------------------------------------------------- + +;---------- Service Type ------------- +; SERVICE_KERNEL_DRIVER = 0x01 +; SERVICE_WIN32_OWN_PROCESS = 0x10 +;---------- Service Type ------------- + +;---------- Start Mode --------------- +; SERVICE_BOOT_START = 0x0 +; SERVICE_SYSTEM_START = 0x1 +; SERVICE_AUTO_START = 0x2 +; SERVICE_DEMAND_START = 0x3 +; SERVICE_DISABLED = 0x4 +;---------- Start Mode --------------- + +[@PRODUCT_TAP_WIN_COMPONENT_ID@.service] + DisplayName = %DeviceDescription% + ServiceType = 1 + StartType = 3 + ErrorControl = 1 + LoadOrderGroup = NDIS + ServiceBinary = %12%\@PRODUCT_TAP_WIN_COMPONENT_ID@.sys + +;----------------------------------------------------------------- +; File Installation +;----------------------------------------------------------------- + +;----------------- Copy Flags ------------ +; COPYFLG_NOSKIP = 0x02 +; COPYFLG_NOVERSIONCHECK = 0x04 +;----------------- Copy Flags ------------ + +; SourceDisksNames +; diskid = description[, [tagfile] [, <unused>, subdir]] +; 1 = "Intel Driver Disk 1",e100bex.sys,, + +[SourceDisksNames] + 1 = %DeviceDescription%, @PRODUCT_TAP_WIN_COMPONENT_ID@.sys + +; SourceDisksFiles +; filename_on_source = diskID[, [subdir][, size]] +; e100bex.sys = 1,, ; on distribution disk 1 + +[SourceDisksFiles] +@PRODUCT_TAP_WIN_COMPONENT_ID@.sys = 1 + +[DestinationDirs] + @PRODUCT_TAP_WIN_COMPONENT_ID@.files = 11 + @PRODUCT_TAP_WIN_COMPONENT_ID@.driver = 12 + +[@PRODUCT_TAP_WIN_COMPONENT_ID@.files] +; TapPanel.cpl,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK +; cipsrvr.exe,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK + +[@PRODUCT_TAP_WIN_COMPONENT_ID@.driver] + @PRODUCT_TAP_WIN_COMPONENT_ID@.sys,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK + +;--------------------------------------------------------------- +; End +;--------------------------------------------------------------- diff --git a/src/SOURCES.in b/src/SOURCES.in index 2f77365..3e1ee81 100755 --- a/src/SOURCES.in +++ b/src/SOURCES.in @@ -4,7 +4,7 @@ MAJORCOMP=ntos MINORCOMP=ndis -TARGETNAME=@@PRODUCT_TAP_ID@@ +TARGETNAME=@PRODUCT_TAP_WIN_COMPONENT_ID@ TARGETTYPE=DRIVER TARGETPATH=. TARGETLIBS=$(DDK_LIB_PATH)\ndis.lib $(DDK_LIB_PATH)\ntstrsafe.lib @@ -13,8 +13,9 @@ INCLUDES=$(DDK_INCLUDE_PATH) .. # The TAP version numbers here must be >= # PRODUCT_TAP_WIN32_MIN_x values defined in version.m4 C_DEFINES= -C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MAJOR_VERSION=@@PRODUCT_TAP_MAJOR_VER@@ -C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MINOR_VERSION=@@PRODUCT_TAP_MINOR_VER@@ +C_DEFINES=$(C_DEFINES) @EXTRA_C_DEFINES@ +C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MAJOR_VERSION=@PRODUCT_TAP_WIN_MAJOR@ +C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MINOR_VERSION=@PRODUCT_TAP_WIN_MINOR@ # Produce the same symbolic information for both free & checked builds. # This will allow us to perform full source-level debugging on both diff --git a/src/config.h.in b/src/config.h.in new file mode 100644 index 0000000..322afa8 --- /dev/null +++ b/src/config.h.in @@ -0,0 +1,9 @@ +#define PRODUCT_NAME	"@PRODUCT_NAME@" +#define PRODUCT_VERSION	"@PRODUCT_VERSION@" +#define PRODUCT_VERSION_RESOURCE	@PRODUCT_VERSION_RESOURCE@ +#define PRODUCT_TAP_WIN_COMPONENT_ID	"@PRODUCT_TAP_WIN_COMPONENT_ID@" +#define PRODUCT_TAP_WIN_MAJOR	@PRODUCT_TAP_WIN_MAJOR@ +#define PRODUCT_TAP_WIN_MINOR	@PRODUCT_TAP_WIN_MINOR@ +#define PRODUCT_TAP_WIN_PROVIDER	"@PRODUCT_TAP_WIN_PROVIDER@" +#define PRODUCT_TAP_WIN_DEVICE_DESCRIPTION	"@PRODUCT_TAP_WIN_DEVICE_DESCRIPTION@" +#define PRODUCT_TAP_WIN_RELDATE	"@PRODUCT_TAP_WIN_RELDATE@" diff --git a/src/error.c b/src/error.c index 271dafc..69e9ec6 100755 --- a/src/error.c +++ b/src/error.c @@ -95,7 +95,9 @@ MyDebugPrint ... [truncated message content]

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- COPYING | 40 +++++++ COPYRIGHT.GPL | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 379 insertions(+), 0 deletions(-) create mode 100644 COPYING create mode 100644 COPYRIGHT.GPL diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..5686795 --- /dev/null +++ b/COPYING @@ -0,0 +1,40 @@ +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-2010 OpenVPN Technologies, Inc., and is released under + the GPL version 2. + +NSIS License: +------------- + + Copyright (C) 2002-2003 Joost Verburg + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute + it freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment in the + product documentation would be appreciated but is not required. + 2. Altered versions must be plainly marked as such, + and must not be misrepresented as being the original software. + 3. This notice may not be removed or altered from any distribution. + +GNU Public License (GPL) +------------------------ + + TAP-Win32 distributions are licensed under the GPL version 2 (see + COPYRIGHT.GPL). + + In the Windows binary distribution of OpenVPN, the + GPL is reproduced below. + diff --git a/COPYRIGHT.GPL b/COPYRIGHT.GPL new file mode 100644 index 0000000..ff8a7f0 --- /dev/null +++ b/COPYRIGHT.GPL @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 + as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- .gitignore | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..230ee15 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +*.pdb +*.sys +*.map +*.cod +src/obj* +src/amd64 +src/i386 +src/SOURCES +src/i386/OemWin2k.inf +src/config.h -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- src/common.h | 82 ----------------------------------------------------- src/resource.rc | 3 -- src/tap-windows.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/tapdrvr.c | 2 +- 4 files changed, 83 insertions(+), 86 deletions(-) delete mode 100755 src/common.h create mode 100755 src/tap-windows.h diff --git a/src/common.h b/src/common.h deleted file mode 100755 index 8dceda5..0000000 --- a/src/common.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * TAP-Windows -- A kernel driver to provide virtual tap - * device functionality on Windows. - * - * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. - * - * This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc., - * 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 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program (see the file COPYING included with this - * distribution); if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -//=============================================== -// This file is included both by OpenVPN and -// the TAP-Windows driver and contains definitions -// common to both. -//=============================================== - -#ifndef HAVE_CONFIG_H -#include "autodefs.h" -#endif - -//============= -// TAP IOCTLs -//============= - -#define TAP_CONTROL_CODE(request,method) \ - CTL_CODE (FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS) - -// Present in 8.1 - -#define TAP_IOCTL_GET_MAC TAP_CONTROL_CODE (1, METHOD_BUFFERED) -#define TAP_IOCTL_GET_VERSION TAP_CONTROL_CODE (2, METHOD_BUFFERED) -#define TAP_IOCTL_GET_MTU TAP_CONTROL_CODE (3, METHOD_BUFFERED) -#define TAP_IOCTL_GET_INFO TAP_CONTROL_CODE (4, METHOD_BUFFERED) -#define TAP_IOCTL_CONFIG_POINT_TO_POINT TAP_CONTROL_CODE (5, METHOD_BUFFERED) -#define TAP_IOCTL_SET_MEDIA_STATUS TAP_CONTROL_CODE (6, METHOD_BUFFERED) -#define TAP_IOCTL_CONFIG_DHCP_MASQ TAP_CONTROL_CODE (7, METHOD_BUFFERED) -#define TAP_IOCTL_GET_LOG_LINE TAP_CONTROL_CODE (8, METHOD_BUFFERED) -#define TAP_IOCTL_CONFIG_DHCP_SET_OPT TAP_CONTROL_CODE (9, METHOD_BUFFERED) - -// Added in 8.2 - -/* obsoletes TAP_IOCTL_CONFIG_POINT_TO_POINT */ -#define TAP_IOCTL_CONFIG_TUN TAP_CONTROL_CODE (10, METHOD_BUFFERED) - -//================= -// Registry keys -//================= - -#define ADAPTER_KEY "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}" - -#define NETWORK_CONNECTIONS_KEY "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}" - -//====================== -// Filesystem prefixes -//====================== - -#define USERMODEDEVICEDIR "\\\\.\\Global\\" -#define SYSDEVICEDIR "\\Device\\" -#define USERDEVICEDIR "\\DosDevices\\Global\\" -#define TAPSUFFIX ".tap" - -//========================================================= -// TAP_COMPONENT_ID -- This string defines the TAP driver -// type -- different component IDs can reside in the system -// simultaneously. -//========================================================= - -#define TAP_COMPONENT_ID TAP_ID diff --git a/src/resource.rc b/src/resource.rc index d50b60f..d5a7c35 100755 --- a/src/resource.rc +++ b/src/resource.rc @@ -1,9 +1,6 @@ #include <windows.h> #include <ntverp.h> -/* get VERSION */ -#include "common.h" - #undef VER_PRODUCTVERSION #undef VER_PRODUCTVERSION_STR #undef VER_COMPANYNAME_STR diff --git a/src/tap-windows.h b/src/tap-windows.h new file mode 100755 index 0000000..8dceda5 --- /dev/null +++ b/src/tap-windows.h @@ -0,0 +1,82 @@ +/* + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. + * + * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. + * + * This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc., + * 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 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program (see the file COPYING included with this + * distribution); if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +//=============================================== +// This file is included both by OpenVPN and +// the TAP-Windows driver and contains definitions +// common to both. +//=============================================== + +#ifndef HAVE_CONFIG_H +#include "autodefs.h" +#endif + +//============= +// TAP IOCTLs +//============= + +#define TAP_CONTROL_CODE(request,method) \ + CTL_CODE (FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS) + +// Present in 8.1 + +#define TAP_IOCTL_GET_MAC TAP_CONTROL_CODE (1, METHOD_BUFFERED) +#define TAP_IOCTL_GET_VERSION TAP_CONTROL_CODE (2, METHOD_BUFFERED) +#define TAP_IOCTL_GET_MTU TAP_CONTROL_CODE (3, METHOD_BUFFERED) +#define TAP_IOCTL_GET_INFO TAP_CONTROL_CODE (4, METHOD_BUFFERED) +#define TAP_IOCTL_CONFIG_POINT_TO_POINT TAP_CONTROL_CODE (5, METHOD_BUFFERED) +#define TAP_IOCTL_SET_MEDIA_STATUS TAP_CONTROL_CODE (6, METHOD_BUFFERED) +#define TAP_IOCTL_CONFIG_DHCP_MASQ TAP_CONTROL_CODE (7, METHOD_BUFFERED) +#define TAP_IOCTL_GET_LOG_LINE TAP_CONTROL_CODE (8, METHOD_BUFFERED) +#define TAP_IOCTL_CONFIG_DHCP_SET_OPT TAP_CONTROL_CODE (9, METHOD_BUFFERED) + +// Added in 8.2 + +/* obsoletes TAP_IOCTL_CONFIG_POINT_TO_POINT */ +#define TAP_IOCTL_CONFIG_TUN TAP_CONTROL_CODE (10, METHOD_BUFFERED) + +//================= +// Registry keys +//================= + +#define ADAPTER_KEY "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}" + +#define NETWORK_CONNECTIONS_KEY "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}" + +//====================== +// Filesystem prefixes +//====================== + +#define USERMODEDEVICEDIR "\\\\.\\Global\\" +#define SYSDEVICEDIR "\\Device\\" +#define USERDEVICEDIR "\\DosDevices\\Global\\" +#define TAPSUFFIX ".tap" + +//========================================================= +// TAP_COMPONENT_ID -- This string defines the TAP driver +// type -- different component IDs can reside in the system +// simultaneously. +//========================================================= + +#define TAP_COMPONENT_ID TAP_ID diff --git a/src/tapdrvr.c b/src/tapdrvr.c index 2156f8b..ffc5813 100755 --- a/src/tapdrvr.c +++ b/src/tapdrvr.c @@ -35,7 +35,7 @@ // TAP_IOCTL_CONFIG_TUN ioctl. //====================================================== -#include "common.h" +#include "tap-windows.h" #define NDIS_MINIPORT_DRIVER #define BINARY_COMPATIBLE 0 -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- src/dhcp.c | 2 +- src/resource.rc | 2 +- src/tap-windows.h | 46 ++++++++++++++++------------------------------ src/tapdrvr.c | 28 ++++++++++++++-------------- 4 files changed, 32 insertions(+), 46 deletions(-) diff --git a/src/dhcp.c b/src/dhcp.c index 62602c9..89e601d 100755 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -391,7 +391,7 @@ SendDHCPMsg (const TapAdapterPointer a, //=================================================================== // Handle a BOOTPS packet produced by the local system to // resolve the address/netmask of this adapter. -// If we are in TAP_IOCTL_CONFIG_DHCP_MASQ mode, reply +// If we are in TAP_WIN_IOCTL_CONFIG_DHCP_MASQ mode, reply // to the message. Return TRUE if we processed the passed // message, so that downstream stages can ignore it. //=================================================================== diff --git a/src/resource.rc b/src/resource.rc index d5a7c35..ed7cf20 100755 --- a/src/resource.rc +++ b/src/resource.rc @@ -36,7 +36,7 @@ #define VER_COMPANYNAME_STR "The OpenVPN Project" #define VER_FILEDESCRIPTION_STR "TAP-Windows Virtual Network Driver" -#define VER_ORIGINALFILENAME_STR TAP_COMPONENT_ID ".sys" +#define VER_ORIGINALFILENAME_STR PRODUCT_TAP_ID ".sys" #define VER_LEGALCOPYRIGHT_YEARS "2003-2010" #define VER_LEGALCOPYRIGHT_STR "OpenVPN Technologies, Inc." diff --git a/src/tap-windows.h b/src/tap-windows.h index 8dceda5..243a4a2 100755 --- a/src/tap-windows.h +++ b/src/tap-windows.h @@ -21,40 +21,32 @@ * distribution); if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -//=============================================== -// This file is included both by OpenVPN and -// the TAP-Windows driver and contains definitions -// common to both. -//=============================================== - -#ifndef HAVE_CONFIG_H -#include "autodefs.h" -#endif +#ifndef __TAP_WIN_H +#define __TAP_WIN_H //============= // TAP IOCTLs //============= -#define TAP_CONTROL_CODE(request,method) \ +#define TAP_WIN_CONTROL_CODE(request,method) \ CTL_CODE (FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS) // Present in 8.1 -#define TAP_IOCTL_GET_MAC TAP_CONTROL_CODE (1, METHOD_BUFFERED) -#define TAP_IOCTL_GET_VERSION TAP_CONTROL_CODE (2, METHOD_BUFFERED) -#define TAP_IOCTL_GET_MTU TAP_CONTROL_CODE (3, METHOD_BUFFERED) -#define TAP_IOCTL_GET_INFO TAP_CONTROL_CODE (4, METHOD_BUFFERED) -#define TAP_IOCTL_CONFIG_POINT_TO_POINT TAP_CONTROL_CODE (5, METHOD_BUFFERED) -#define TAP_IOCTL_SET_MEDIA_STATUS TAP_CONTROL_CODE (6, METHOD_BUFFERED) -#define TAP_IOCTL_CONFIG_DHCP_MASQ TAP_CONTROL_CODE (7, METHOD_BUFFERED) -#define TAP_IOCTL_GET_LOG_LINE TAP_CONTROL_CODE (8, METHOD_BUFFERED) -#define TAP_IOCTL_CONFIG_DHCP_SET_OPT TAP_CONTROL_CODE (9, METHOD_BUFFERED) +#define TAP_WIN_IOCTL_GET_MAC TAP_WIN_CONTROL_CODE (1, METHOD_BUFFERED) +#define TAP_WIN_IOCTL_GET_VERSION TAP_WIN_CONTROL_CODE (2, METHOD_BUFFERED) +#define TAP_WIN_IOCTL_GET_MTU TAP_WIN_CONTROL_CODE (3, METHOD_BUFFERED) +#define TAP_WIN_IOCTL_GET_INFO TAP_WIN_CONTROL_CODE (4, METHOD_BUFFERED) +#define TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT TAP_WIN_CONTROL_CODE (5, METHOD_BUFFERED) +#define TAP_WIN_IOCTL_SET_MEDIA_STATUS TAP_WIN_CONTROL_CODE (6, METHOD_BUFFERED) +#define TAP_WIN_IOCTL_CONFIG_DHCP_MASQ TAP_WIN_CONTROL_CODE (7, METHOD_BUFFERED) +#define TAP_WIN_IOCTL_GET_LOG_LINE TAP_WIN_CONTROL_CODE (8, METHOD_BUFFERED) +#define TAP_WIN_IOCTL_CONFIG_DHCP_SET_OPT TAP_WIN_CONTROL_CODE (9, METHOD_BUFFERED) // Added in 8.2 -/* obsoletes TAP_IOCTL_CONFIG_POINT_TO_POINT */ -#define TAP_IOCTL_CONFIG_TUN TAP_CONTROL_CODE (10, METHOD_BUFFERED) +/* obsoletes TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT */ +#define TAP_WIN_IOCTL_CONFIG_TUN TAP_WIN_CONTROL_CODE (10, METHOD_BUFFERED) //================= // Registry keys @@ -71,12 +63,6 @@ #define USERMODEDEVICEDIR "\\\\.\\Global\\" #define SYSDEVICEDIR "\\Device\\" #define USERDEVICEDIR "\\DosDevices\\Global\\" -#define TAPSUFFIX ".tap" +#define TAP_WIN_SUFFIX ".tap" -//========================================================= -// TAP_COMPONENT_ID -- This string defines the TAP driver -// type -- different component IDs can reside in the system -// simultaneously. -//========================================================= - -#define TAP_COMPONENT_ID TAP_ID +#endif diff --git a/src/tapdrvr.c b/src/tapdrvr.c index ffc5813..d183902 100755 --- a/src/tapdrvr.c +++ b/src/tapdrvr.c @@ -31,8 +31,8 @@ // By default we operate as a "tap" virtual ethernet // 802.3 interface, but we can emulate a "tun" // interface (point-to-point IPv4) through the -// TAP_IOCTL_CONFIG_POINT_TO_POINT or -// TAP_IOCTL_CONFIG_TUN ioctl. +// TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT or +// TAP_WIN_IOCTL_CONFIG_TUN ioctl. //====================================================== #include "tap-windows.h" @@ -824,7 +824,7 @@ CreateTapDevice (TapExtensionPointer p_Extension, const char *p_Name) "%s%s%s", SYSDEVICEDIR, l_UsableName, - TAPSUFFIX); + TAP_WIN_SUFFIX); if (l_Status != STATUS_SUCCESS) { @@ -850,7 +850,7 @@ CreateTapDevice (TapExtensionPointer p_Extension, const char *p_Name) "%s%s%s", USERDEVICEDIR, l_UsableName, - TAPSUFFIX); + TAP_WIN_SUFFIX); if (l_Status != STATUS_SUCCESS) { @@ -1914,7 +1914,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP) {	switch (l_IrpSp->Parameters.DeviceIoControl.IoControlCode) { - case TAP_IOCTL_GET_MAC: + case TAP_WIN_IOCTL_GET_MAC: { if (l_IrpSp->Parameters.DeviceIoControl.OutputBufferLength >= sizeof (MACADDR)) @@ -1930,7 +1930,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP)	} break; } - case TAP_IOCTL_GET_VERSION: + case TAP_WIN_IOCTL_GET_VERSION: { const ULONG size = sizeof (ULONG) * 3; if (l_IrpSp->Parameters.DeviceIoControl.OutputBufferLength @@ -1956,7 +1956,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP) break; } - case TAP_IOCTL_GET_MTU: + case TAP_WIN_IOCTL_GET_MTU: { const ULONG size = sizeof (ULONG) * 1; if (l_IrpSp->Parameters.DeviceIoControl.OutputBufferLength @@ -1974,7 +1974,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP) break; } - case TAP_IOCTL_GET_INFO: + case TAP_WIN_IOCTL_GET_INFO: { char state[16]; if (l_Adapter->m_InterfaceIsRunning) @@ -2035,7 +2035,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP) } #if DBG - case TAP_IOCTL_GET_LOG_LINE: + case TAP_WIN_IOCTL_GET_LOG_LINE: { if (GetDebugLine ((LPTSTR)p_IRP->AssociatedIrp.SystemBuffer,	l_IrpSp->Parameters.DeviceIoControl.OutputBufferLength)) @@ -2050,7 +2050,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP) } #endif - case TAP_IOCTL_CONFIG_TUN: + case TAP_WIN_IOCTL_CONFIG_TUN: { if (l_IrpSp->Parameters.DeviceIoControl.InputBufferLength >= (sizeof (IPADDR) * 3)) @@ -2097,7 +2097,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP) break; } - case TAP_IOCTL_CONFIG_POINT_TO_POINT: // Obsoleted by TAP_IOCTL_CONFIG_TUN + case TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT: // Obsoleted by TAP_WIN_IOCTL_CONFIG_TUN { if (l_IrpSp->Parameters.DeviceIoControl.InputBufferLength >= (sizeof (IPADDR) * 2)) @@ -2136,7 +2136,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP) break; } - case TAP_IOCTL_SET_MEDIA_STATUS: + case TAP_WIN_IOCTL_SET_MEDIA_STATUS: { if (l_IrpSp->Parameters.DeviceIoControl.InputBufferLength >= (sizeof (ULONG) * 1)) @@ -2153,7 +2153,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP) break; } - case TAP_IOCTL_CONFIG_DHCP_MASQ: + case TAP_WIN_IOCTL_CONFIG_DHCP_MASQ: { if (l_IrpSp->Parameters.DeviceIoControl.InputBufferLength >= (sizeof (IPADDR) * 4)) @@ -2194,7 +2194,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP) break; } - case TAP_IOCTL_CONFIG_DHCP_SET_OPT: + case TAP_WIN_IOCTL_CONFIG_DHCP_SET_OPT: { if (l_IrpSp->Parameters.DeviceIoControl.InputBufferLength <= DHCP_USER_SUPPLIED_OPTIONS_BUFFER_SIZE -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- src/SOURCES.in | 2 +- src/common.h | 6 +++--- src/constants.h | 4 ++-- src/dhcp.c | 4 ++-- src/dhcp.h | 4 ++-- src/endian.h | 4 ++-- src/error.c | 4 ++-- src/error.h | 4 ++-- src/hexdump.c | 4 ++-- src/hexdump.h | 4 ++-- src/i386/OemWin2k.inf.in | 6 +++--- src/instance.c | 4 ++-- src/lock.h | 4 ++-- src/macinfo.c | 4 ++-- src/macinfo.h | 4 ++-- src/mem.c | 4 ++-- src/proto.h | 4 ++-- src/prototypes.h | 4 ++-- src/resource.rc | 2 +- src/tapdrvr.c | 6 +++--- src/types.h | 4 ++-- 21 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/SOURCES.in b/src/SOURCES.in index cf030f4..2f77365 100755 --- a/src/SOURCES.in +++ b/src/SOURCES.in @@ -1,4 +1,4 @@ -# Build TAP-Win32 driver. +# Build TAP-Windows driver. # Build Command: build -cef MAJORCOMP=ntos diff --git a/src/common.h b/src/common.h index bb8ab90..8dceda5 100755 --- a/src/common.h +++ b/src/common.h @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * @@ -24,7 +24,7 @@ //=============================================== // This file is included both by OpenVPN and -// the TAP-Win32 driver and contains definitions +// the TAP-Windows driver and contains definitions // common to both. //=============================================== diff --git a/src/constants.h b/src/constants.h index 9bbd7ee..2451f12 100755 --- a/src/constants.h +++ b/src/constants.h @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/dhcp.c b/src/dhcp.c index 3891d42..62602c9 100755 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/dhcp.h b/src/dhcp.h index 4215f81..94765a7 100755 --- a/src/dhcp.h +++ b/src/dhcp.h @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/endian.h b/src/endian.h index 128029a..0f7025d 100755 --- a/src/endian.h +++ b/src/endian.h @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/error.c b/src/error.c index 0541bc3..271dafc 100755 --- a/src/error.c +++ b/src/error.c @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/error.h b/src/error.h index d8436dc..47f436c 100755 --- a/src/error.h +++ b/src/error.h @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/hexdump.c b/src/hexdump.c index 49bc38c..8589f4b 100755 --- a/src/hexdump.c +++ b/src/hexdump.c @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/hexdump.h b/src/hexdump.h index c1af705..d0b152d 100755 --- a/src/hexdump.h +++ b/src/hexdump.h @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/i386/OemWin2k.inf.in b/src/i386/OemWin2k.inf.in index 031b06c..34888f2 100755 --- a/src/i386/OemWin2k.inf.in +++ b/src/i386/OemWin2k.inf.in @@ -18,10 +18,10 @@ ;********************************************************* ; Note to Developers: ; -; If you are bundling the TAP-Win32 driver with your app, +; If you are bundling the TAP-Windows driver with your app, ; you should try to rename it in such a way that it will -; not collide with other instances of TAP-Win32 defined -; by other apps. Multiple versions of the TAP-Win32 +; not collide with other instances of TAP-Windows defined +; by other apps. Multiple versions of the TAP-Windows ; driver, each installed by different apps, can coexist ; on the same machine if you follow these guidelines. ; NOTE: these instructions assume you are editing the diff --git a/src/instance.c b/src/instance.c index 182cee8..33ef878 100755 --- a/src/instance.c +++ b/src/instance.c @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/lock.h b/src/lock.h index ea75414..e2a2029 100755 --- a/src/lock.h +++ b/src/lock.h @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/macinfo.c b/src/macinfo.c index 8d512ec..fca5307 100755 --- a/src/macinfo.c +++ b/src/macinfo.c @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/macinfo.h b/src/macinfo.h index 51e930d..ba843e8 100755 --- a/src/macinfo.h +++ b/src/macinfo.h @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/mem.c b/src/mem.c index 6fbbed5..c56304c 100755 --- a/src/mem.c +++ b/src/mem.c @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/proto.h b/src/proto.h index 894a37f..71916a9 100755 --- a/src/proto.h +++ b/src/proto.h @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/prototypes.h b/src/prototypes.h index 18c566f..50cc461 100755 --- a/src/prototypes.h +++ b/src/prototypes.h @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * diff --git a/src/resource.rc b/src/resource.rc index 8b2d2f6..d50b60f 100755 --- a/src/resource.rc +++ b/src/resource.rc @@ -38,7 +38,7 @@ */ #define VER_COMPANYNAME_STR "The OpenVPN Project" -#define VER_FILEDESCRIPTION_STR "TAP-Win32 Virtual Network Driver" +#define VER_FILEDESCRIPTION_STR "TAP-Windows Virtual Network Driver" #define VER_ORIGINALFILENAME_STR TAP_COMPONENT_ID ".sys" #define VER_LEGALCOPYRIGHT_YEARS "2003-2010" #define VER_LEGALCOPYRIGHT_STR "OpenVPN Technologies, Inc." diff --git a/src/tapdrvr.c b/src/tapdrvr.c index 0f75b77..2156f8b 100755 --- a/src/tapdrvr.c +++ b/src/tapdrvr.c @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * @@ -928,7 +928,7 @@ CreateTapDevice (TapExtensionPointer p_Extension, const char *p_Name) // to satisfy IRP requests in the IRP queue. // // QueueLock is used to lock the packet queue used - // for the TAP-Win32 NIC -> User Space packet flow direction. + // for the TAP-Windows NIC -> User Space packet flow direction. // // All accesses to packet or IRP queues should be // bracketed by the QueueLock spinlock, diff --git a/src/types.h b/src/types.h index bdc08e7..6ca841d 100755 --- a/src/types.h +++ b/src/types.h @@ -1,6 +1,6 @@ /* - * TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap - * device functionality on Windows. + * TAP-Windows -- A kernel driver to provide virtual tap + * device functionality on Windows. * * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. * -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- src/prototypes.h | 2 +- src/tapdrvr.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/prototypes.h b/src/prototypes.h index 55454d5..18c566f 100755 --- a/src/prototypes.h +++ b/src/prototypes.h @@ -202,7 +202,7 @@ VOID HookDispatchFunctions(); #if ENABLE_NONADMIN -#if DDKVER_MAJOR < 5600 +#if defined(DDKVER_MAJOR) && DDKVER_MAJOR < 5600 /* * Better solution for use on Vista DDK, but possibly not compatible with * earlier DDKs: diff --git a/src/tapdrvr.c b/src/tapdrvr.c index 0df076a..0f75b77 100755 --- a/src/tapdrvr.c +++ b/src/tapdrvr.c @@ -36,9 +36,6 @@ //====================================================== #include "common.h" -#ifndef DDKVER_MAJOR -#error DDKVER_MAJOR must be defined as the major number of the DDK Version -#endif #define NDIS_MINIPORT_DRIVER #define BINARY_COMPATIBLE 0 @@ -66,7 +63,7 @@ //======================================================== #define ENABLE_NONADMIN 1 -#if DDKVER_MAJOR < 5600 +#if defined(DDKVER_MAJOR) && DDKVER_MAJOR < 5600 #include <ndis.h> #include <ntstrsafe.h> #include <ntddk.h> -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- src/error.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/error.c b/src/error.c index 5b25f48..0541bc3 100755 --- a/src/error.c +++ b/src/error.c @@ -81,6 +81,11 @@ MyDebugPrint (const unsigned char* format, ...) NTSTATUS status; char *end; +#ifdef DBG_PRINT + va_start (args, format); + vDbgPrintEx (DPFLTR_IHVNETWORK_ID, DPFLTR_INFO_LEVEL, format, args); + va_end (args); +#endif va_start (args, format); status = RtlStringCchVPrintfExA (g_Debug.text + g_Debug.out, remaining, -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- src/resource.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/resource.rc b/src/resource.rc index 84884cf..8b2d2f6 100755 --- a/src/resource.rc +++ b/src/resource.rc @@ -4,6 +4,11 @@ /* get VERSION */ #include "common.h" +#undef VER_PRODUCTVERSION +#undef VER_PRODUCTVERSION_STR +#undef VER_COMPANYNAME_STR +#undef VER_PRODUCTNAME_STR + /* VER_FILETYPE, VER_FILESUBTYPE, VER_FILEDESCRIPTION_STR * and VER_INTERNALNAME_STR must be defined before including COMMON.VER * The strings don't need a '\0', since common.ver has them. -- 1.7.3.4 

1. cleanup warnings. 2. new directory layout 3. rename TAP-Win32 -> TAP-Windows 4. build system. 5. installer. Alon Bar-Lev (11): cleanup: rename tap-win32->src cleanup: OACR warnings cleanup: remove warnings of redefinition of macros debug: add DbgPrint support build: set default to newer ddk cleanup: replace TAP-Win32->TAP-Windows cleanup: rename common.h->tap-windows.h cleanup: add TAP_WIN prefix to exports cleanup: create .gitignore docs: add COPYING COPYRIGHT.GPL build: initial build .gitignore | 15 + COPYING | 40 + COPYRIGHT.GPL | 339 +++++ _build.bat | 49 + build.bat | 55 + build/MSCV-VSClass3.cer | 29 + build/msvc-generate.js | 118 ++ build/unix2dos.js | 54 + build/vars.amd64.m4 | 2 + build/vars.i386.m4 | 2 + build/zip.js | 74 + config-env.bat.in | 12 + configure.bat | 88 ++ installer/StrStr.nsi | 47 + installer/build.bat | 88 ++ installer/icon.ico | Bin 0 -> 22486 bytes installer/install-whirl.bmp | Bin 0 -> 25820 bytes installer/tap-windows.nsi | 296 ++++ src/MAKEFILE | 6 + src/OemWin2k.inf.in | 187 +++ src/SOURCES.in | 65 + src/config.h.in | 9 + src/constants.h | 52 + src/dhcp.c | 599 ++++++++ src/dhcp.h | 164 +++ src/endian.h | 35 + src/error.c | 385 +++++ src/error.h | 88 ++ src/hexdump.c | 69 + src/hexdump.h | 63 + src/instance.c | 241 +++ src/lock.h | 75 + src/macinfo.c | 154 ++ src/macinfo.h | 38 + src/mem.c | 186 +++ src/proto.h | 224 +++ src/prototypes.h | 260 ++++ src/resource.rc | 62 + src/tap-windows.h | 68 + src/tapdrvr.c | 3147 ++++++++++++++++++++++++++++++++++++++++ src/types.h | 178 +++ tap-win32/MAKEFILE | 6 - tap-win32/SOURCES.in | 64 - tap-win32/common.h | 82 -- tap-win32/constants.h | 52 - tap-win32/dhcp.c | 599 -------- tap-win32/dhcp.h | 164 --- tap-win32/endian.h | 35 - tap-win32/error.c | 378 ----- tap-win32/error.h | 88 -- tap-win32/hexdump.c | 69 - tap-win32/hexdump.h | 63 - tap-win32/i386/OemWin2k.inf.in | 195 --- tap-win32/instance.c | 241 --- tap-win32/lock.h | 75 - tap-win32/macinfo.c | 154 -- tap-win32/macinfo.h | 38 - tap-win32/mem.c | 186 --- tap-win32/proto.h | 224 --- tap-win32/prototypes.h | 260 ---- tap-win32/resource.rc | 58 - tap-win32/tapdrvr.c | 3146 --------------------------------------- tap-win32/types.h | 178 --- version.m4 | 11 + 64 files changed, 7674 insertions(+), 6355 deletions(-) create mode 100644 .gitignore create mode 100644 COPYING create mode 100644 COPYRIGHT.GPL create mode 100644 _build.bat create mode 100644 build.bat create mode 100644 build/MSCV-VSClass3.cer create mode 100644 build/msvc-generate.js create mode 100644 build/unix2dos.js create mode 100644 build/vars.amd64.m4 create mode 100644 build/vars.i386.m4 create mode 100644 build/zip.js create mode 100644 config-env.bat.in create mode 100644 configure.bat create mode 100755 installer/StrStr.nsi create mode 100644 installer/build.bat create mode 100755 installer/icon.ico create mode 100755 installer/install-whirl.bmp create mode 100755 installer/tap-windows.nsi create mode 100755 src/MAKEFILE create mode 100755 src/OemWin2k.inf.in create mode 100755 src/SOURCES.in create mode 100644 src/config.h.in create mode 100755 src/constants.h create mode 100755 src/dhcp.c create mode 100755 src/dhcp.h create mode 100755 src/endian.h create mode 100755 src/error.c create mode 100755 src/error.h create mode 100755 src/hexdump.c create mode 100755 src/hexdump.h create mode 100755 src/instance.c create mode 100755 src/lock.h create mode 100755 src/macinfo.c create mode 100755 src/macinfo.h create mode 100755 src/mem.c create mode 100755 src/proto.h create mode 100755 src/prototypes.h create mode 100755 src/resource.rc create mode 100755 src/tap-windows.h create mode 100755 src/tapdrvr.c create mode 100755 src/types.h delete mode 100755 tap-win32/MAKEFILE delete mode 100755 tap-win32/SOURCES.in delete mode 100755 tap-win32/common.h delete mode 100755 tap-win32/constants.h delete mode 100755 tap-win32/dhcp.c delete mode 100755 tap-win32/dhcp.h delete mode 100755 tap-win32/endian.h delete mode 100755 tap-win32/error.c delete mode 100755 tap-win32/error.h delete mode 100755 tap-win32/hexdump.c delete mode 100755 tap-win32/hexdump.h delete mode 100755 tap-win32/i386/OemWin2k.inf.in delete mode 100755 tap-win32/instance.c delete mode 100755 tap-win32/lock.h delete mode 100755 tap-win32/macinfo.c delete mode 100755 tap-win32/macinfo.h delete mode 100755 tap-win32/mem.c delete mode 100755 tap-win32/proto.h delete mode 100755 tap-win32/prototypes.h delete mode 100755 tap-win32/resource.rc delete mode 100755 tap-win32/tapdrvr.c delete mode 100755 tap-win32/types.h create mode 100644 version.m4 -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- Makefile.am | 2 + configure.ac | 3 ++ distro/Makefile.am | 15 +++++++++ distro/rpm/Makefile.am | 15 +++++++++ distro/rpm/easy-rsa.spec.in | 68 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 103 insertions(+), 0 deletions(-) create mode 100644 distro/Makefile.am create mode 100644 distro/rpm/Makefile.am create mode 100644 distro/rpm/easy-rsa.spec.in diff --git a/Makefile.am b/Makefile.am index 743da35..156a3c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,8 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = doc easy-rsa +SUBDIRS = distro + dist_doc_DATA = \	COPYRIGHT.GPL \	COPYING diff --git a/configure.ac b/configure.ac index 1e52ece..61703a2 100644 --- a/configure.ac +++ b/configure.ac @@ -48,5 +48,8 @@ AC_SUBST([easyrsadir]) AC_CONFIG_FILES([	Makefile	doc/Makefile +	distro/Makefile +	distro/rpm/Makefile +	distro/rpm/easy-rsa.spec ]) AC_OUTPUT diff --git a/distro/Makefile.am b/distro/Makefile.am new file mode 100644 index 0000000..f26dc5a --- /dev/null +++ b/distro/Makefile.am @@ -0,0 +1,15 @@ +# +# Easy-RSA -- This is a small RSA key management package, based on the openssl +# command line tool, that can be found in the easy-rsa subdirectory +# of the OpenVPN distribution. While this tool is primary concerned +# with key management for the SSL VPN application space, it can also +# be used for building web certificates. +# +# Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sa...@op...> +# Copyright (C) 2006-2012 Alon Bar-Lev <alo...@gm...> +# + +MAINTAINERCLEANFILES = \ +	$(srcdir)/Makefile.in + +SUBDIRS = rpm diff --git a/distro/rpm/Makefile.am b/distro/rpm/Makefile.am new file mode 100644 index 0000000..49fe48c --- /dev/null +++ b/distro/rpm/Makefile.am @@ -0,0 +1,15 @@ +# +# Easy-RSA -- This is a small RSA key management package, based on the openssl +# command line tool, that can be found in the easy-rsa subdirectory +# of the OpenVPN distribution. While this tool is primary concerned +# with key management for the SSL VPN application space, it can also +# be used for building web certificates. +# +# Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sa...@op...> +# Copyright (C) 2006-2012 Alon Bar-Lev <alo...@gm...> +# + +MAINTAINERCLEANFILES = \ +	$(srcdir)/Makefile.in + +dist_noinst_DATA = easy-rsa.spec diff --git a/distro/rpm/easy-rsa.spec.in b/distro/rpm/easy-rsa.spec.in new file mode 100644 index 0000000..f0d9bfa --- /dev/null +++ b/distro/rpm/easy-rsa.spec.in @@ -0,0 +1,68 @@ +# +# Easy-RSA -- This is a small RSA key management package, based on the openssl +# command line tool, that can be found in the easy-rsa subdirectory +# of the OpenVPN distribution. While this tool is primary concerned +# with key management for the SSL VPN application space, it can also +# be used for building web certificates. +# +# Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sa...@op...> +# Copyright (C) 2006-2012 Alon Bar-Lev <alo...@gm...> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program (see the file COPYING included with this +# distribution); if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +Summary:	Easy-RSA +Name:	easy-rsa +Version:	@PACKAGE_VERSION@ +Release:	1 +License:	GPL-2 +Group:	Security/Cryptography +Source:	%{name}-%{version}.tar.gz +Packager:	OpenVPN Technologies, Inc. <sa...@op...> +Vendor:	OpenVPN Technologies, Inc. +URL:http://openvpn.net +BuildRoot:	%{_tmppath}/%{name}-buildroot +BuildArch:	noarch +Requires:	openssl +%description +This is a small RSA key management package, based on the openssl +command line tool, that can be found in the easy-rsa subdirectory +of the OpenVPN distribution. While this tool is primary concerned +with key management for the SSL VPN application space, it can also +be used for building web certificates. + +%prep +%setup -q + +%build +%configure -q -docdir="%{_docdir}/%{name}-%{version}" +%{__make} + +%install +rm -rf "${RPM_BUILD_ROOT}" +%{__make} install DESTDIR="${RPM_BUILD_ROOT}" + +%clean +rm -rf "${RPM_BUILD_ROOT}" + +%files + +%defattr(-,root,root) +%{_datadir}/easy-rsa +%{_docdir} + +%changelog +* Fri Feb 24 2012 Alon Bar-Lev <alo...@gm...> +- Created initial spec file -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 easy-rsa/1.0/list-crl mode change 100644 => 100755 easy-rsa/1.0/make-crl mode change 100644 => 100755 easy-rsa/1.0/revoke-crt mode change 100755 => 100644 easy-rsa/2.0/openssl-0.9.6.cnf mode change 100755 => 100644 easy-rsa/2.0/openssl-0.9.8.cnf mode change 100755 => 100644 easy-rsa/2.0/openssl-1.0.0.cnf mode change 100755 => 100644 easy-rsa/2.0/vars mode change 100755 => 100644 easy-rsa/Windows/init-config.bat diff --git a/easy-rsa/1.0/list-crl b/easy-rsa/1.0/list-crl old mode 100644 new mode 100755 diff --git a/easy-rsa/1.0/make-crl b/easy-rsa/1.0/make-crl old mode 100644 new mode 100755 diff --git a/easy-rsa/1.0/revoke-crt b/easy-rsa/1.0/revoke-crt old mode 100644 new mode 100755 diff --git a/easy-rsa/2.0/openssl-0.9.6.cnf b/easy-rsa/2.0/openssl-0.9.6.cnf old mode 100755 new mode 100644 diff --git a/easy-rsa/2.0/openssl-0.9.8.cnf b/easy-rsa/2.0/openssl-0.9.8.cnf old mode 100755 new mode 100644 diff --git a/easy-rsa/2.0/openssl-1.0.0.cnf b/easy-rsa/2.0/openssl-1.0.0.cnf old mode 100755 new mode 100644 diff --git a/easy-rsa/2.0/vars b/easy-rsa/2.0/vars old mode 100755 new mode 100644 diff --git a/easy-rsa/Windows/init-config.bat b/easy-rsa/Windows/init-config.bat old mode 100755 new mode 100644 -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- Makefile.am | 2 +- configure.ac | 1 + doc/Makefile.am | 16 ++++ doc/README-1.0 | 161 ++++++++++++++++++++++++++++++++++++ doc/README-2.0 | 229 +++++++++++++++++++++++++++++++++++++++++++++++++++ easy-rsa/1.0/README | 161 ------------------------------------ easy-rsa/2.0/README | 229 --------------------------------------------------- 7 files changed, 408 insertions(+), 391 deletions(-) create mode 100644 doc/Makefile.am create mode 100644 doc/README-1.0 create mode 100644 doc/README-2.0 delete mode 100644 easy-rsa/1.0/README delete mode 100644 easy-rsa/2.0/README diff --git a/Makefile.am b/Makefile.am index f6433d5..743da35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ MAINTAINERCLEANFILES = \	$(srcdir)/depcomp $(srcdir)/aclocal.m4 \	$(srcdir)/config.guess $(srcdir)/config.sub -EXTRA_DIST = easy-rsa +EXTRA_DIST = doc easy-rsa dist_doc_DATA = \	COPYRIGHT.GPL \ diff --git a/configure.ac b/configure.ac index f9625e5..1e52ece 100644 --- a/configure.ac +++ b/configure.ac @@ -47,5 +47,6 @@ AC_SUBST([easyrsadir]) AC_CONFIG_FILES([	Makefile +	doc/Makefile ]) AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..de183c6 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,16 @@ +# +# Easy-RSA -- This is a small RSA key management package, based on the openssl +# command line tool, that can be found in the easy-rsa subdirectory +# of the OpenVPN distribution. While this tool is primary concerned +# with key management for the SSL VPN application space, it can also +# be used for building web certificates. +# +# Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sa...@op...> +# Copyright (C) 2006-2012 Alon Bar-Lev <alo...@gm...> +# + +MAINTAINERCLEANFILES = \ +	$(srcdir)/Makefile.in + +dist_doc_DATA = README-2.0 +dist_noinst_DATA = README-1.0 diff --git a/doc/README-1.0 b/doc/README-1.0 new file mode 100644 index 0000000..fd424ef --- /dev/null +++ b/doc/README-1.0 @@ -0,0 +1,161 @@ +This is a small RSA key management package, +based on the openssl command line tool, that +can be found in the easy-rsa subdirectory +of the OpenVPN distribution. + +These are reference notes. For step +by step instructions, see the HOWTO: + +http://openvpn.net/howto.html + +INSTALL + +1. Edit vars. +2. Set KEY_CONFIG to point to the openssl.cnf file + included in this distribution. +3. Set KEY_DIR to point to a directory which will + contain all keys, certificates, etc. This + directory need not exist, and if it does, + it will be deleted with rm -rf, so BE + CAREFUL how you set KEY_DIR. +4. (Optional) Edit other fields in vars + per your site data. You may want to + increase KEY_SIZE to 2048 if you are + paranoid and don't mind slower key + processing, but certainly 1024 is + fine for testing purposes. KEY_SIZE + must be compatible across both peers + participating in a secure SSL/TLS + connection. +5 . vars +6. ./clean-all +7. As you create certificates, keys, and + certificate signing requests, understand that + only .key files should be kept confidential. + .crt and .csr files can be sent over insecure + channels such as plaintext email. +8. You should never need to copy a .key file + between computers. Normally each computer + will have its own certificate/key pair. + +BUILD YOUR OWN ROOT CERTIFICATE AUTHORITY (CA) CERTIFICATE/KEY + +1. ./build-ca +2. ca.crt and ca.key will be built in your KEY_DIR + directory + +BUILD AN INTERMEDIATE CERTIFICATE AUTHORITY CERTIFICATE/KEY (optional) + +1. ./build-inter inter +2. inter.crt and inter.key will be built in your KEY_DIR + directory and signed with your root certificate. + +BUILD DIFFIE-HELLMAN PARAMETERS (necessary for +the server end of a SSL/TLS connection). + +1. ./build-dh + +BUILD A CERTIFICATE SIGNING REQUEST (If +you want to sign your certificate with a root +certificate controlled by another individual +or organization, or residing on a different machine). + +1. Get ca.crt (the root certificate) from your + certificate authority. Though this + transfer can be over an insecure channel, to prevent + man-in-the-middle attacks you must confirm that + ca.crt was not tampered with. Large CAs solve this + problem by hardwiring their root certificates into + popular web browsers. A simple way to verify a root + CA is to call the issuer on the telephone and confirm + that the md5sum or sha1sum signatures on the ca.crt + files match (such as with the command: "md5sum ca.crt"). +2. Choose a name for your certificate such as your computer + name. In our example we will use "mycert". +3. ./build-req mycert +4. You can ignore most of the fields, but set + "Common Name" to something unique such as your + computer's host name. Leave all password + fields blank, unless you want your private key + to be protected by password. Using a password + is not required -- it will make your key more secure + but also more inconvenient to use, because you will + need to supply your password anytime the key is used. + NOTE: if you are using a password, use ./build-req-pass + instead of ./build-req +5. Your key will be written to $KEY_DIR/mycert.key +6. Your certificate signing request will be written to + to $KEY_DIR/mycert.csr +7. Email mycert.csr to the individual or organization + which controls the root certificate. This can be + done over an insecure channel. +8. After the .csr file is signed by the root certificate + authority, you will receive a file mycert.crt + (your certificate). Place mycert.crt in your + KEY_DIR directory. +9. The combined files of mycert.crt, mycert.key, + and ca.crt can now be used to secure one end of + an SSL/TLS connection. + +SIGN A CERTIFICATE SIGNING REQUEST + +1. ./sign-req mycert +2. mycert.crt will be built in your KEY_DIR + directory using mycert.csr and your root CA + file as input. + +BUILD AND SIGN A CERTIFICATE SIGNING REQUEST +USING A LOCALLY INSTALLED ROOT CERTIFICATE/KEY -- this +script generates and signs a certificate in one step, +but it requires that the generated certificate and private +key files be copied to the destination host over a +secure channel. + +1. ./build-key mycert (no password protection) +2. OR ./build-key-pass mycert (with password protection) +3. OR ./build-key-pkcs12 mycert (PKCS #12 format) +4. OR ./build-key-server mycert (with nsCertType=server) +5. mycert.crt and mycert.key will be built in your + KEY_DIR directory, and mycert.crt will be signed + by your root CA. If ./build-key-pkcs12 was used a + mycert.p12 file will also be created including the + private key, certificate and the ca certificate. + +IMPORTANT + +To avoid a possible Man-in-the-Middle attack where an authorized +client tries to connect to another client by impersonating the +server, make sure to enforce some kind of server certificate +verification by clients. There are currently four different ways +of accomplishing this, listed in the order of preference: + +(1) Build your server certificates with the build-key-server + script. This will designate the certificate as a + server-only certificate by setting nsCertType=server. + Now add the following line to your client configuration: + + ns-cert-type server + + This will block clients from connecting to any + server which lacks the nsCertType=server designation + in its certificate, even if the certificate has been + signed by the CA which is cited in the OpenVPN configuration + file (--ca directive). + +(2) Use the --tls-remote directive on the client to + accept/reject the server connection based on the common + name of the server certificate. + +(3) Use a --tls-verify script or plugin to accept/reject the + server connection based on a custom test of the server + certificate's embedded X509 subject details. + +(4) Sign server certificates with one CA and client certificates + with a different CA. The client config "ca" directive should + reference the server-signing CA while the server config "ca" + directive should reference the client-signing CA. + +NOTES + +Show certificate fields: + openssl x509 -in cert.crt -text diff --git a/doc/README-2.0 b/doc/README-2.0 new file mode 100644 index 0000000..6f5395c --- /dev/null +++ b/doc/README-2.0 @@ -0,0 +1,229 @@ +EASY-RSA Version 2.0-rc1 + +This is a small RSA key management package, based on the openssl +command line tool, that can be found in the easy-rsa subdirectory +of the OpenVPN distribution. While this tool is primary concerned +with key management for the SSL VPN application space, it can also +be used for building web certificates. + +These are reference notes. For step-by-step instructions, see the +HOWTO: + +http://openvpn.net/howto.html + +This package is based on the ./pkitool script. Run ./pkitool +without arguments for a detailed help message (which is also pasted +below). + +Release Notes for easy-rsa-2.0 + +* Most functionality has been consolidated into the pkitool + script. For compatibility, all previous scripts from 1.0 such + as build-key and build-key-server are provided as stubs + which call pkitool to do the real work. + +* pkitool has a --batch flag (enabled by default) which generates + keys/certs without needing any interactive input. pkitool + can still generate certs/keys using interactive prompting by + using the --interact flag. + +* The inherit-inter script has been provided for creating + a new PKI rooted on an intermediate certificate built within a + higher-level PKI. See comments in the inherit-inter script + for more info. + +* The openssl.cnf file has been modified. pkitool will not + work with the openssl.cnf file included with previous + easy-rsa releases. + +* The vars file has been modified -- the following extra + variables have been added: EASY_RSA, CA_EXPIRE, + KEY_EXPIRE. + +* The make-crl and revoke-crt scripts have been removed and + are replaced by the revoke-full script. + +* The "Organizational Unit" X509 field can be set using + the KEY_OU environmental variable before calling pkitool. + +* This release only affects the Linux/Unix version of easy-rsa. + The Windows version (written to use the Windows shell) is unchanged. + +* Use the revoke-full script to revoke a certificate, and generate + (or update) the crl.pem file in the keys directory (as set by the + vars script). Then use "crl-verify crl.pem" in your OpenVPN server + config file, so that OpenVPN can reject any connections coming from + clients which present a revoked certificate. Usage for the script is: + + revoke-full <common-name> + + Note this this procedure is primarily designed to revoke client + certificates. You could theoretically use this method to revoke + server certificates as well, but then you would need to propagate + the crl.pem file to all clients as well, and have them include + "crl-verify crl.pem" in their configuration files. + +* PKCS#11 support was added. + +* For those interested in using this tool to generate web certificates, + A variant of the easy-rsa package that allows the creation of multi-domain + certificates with subjectAltName can be obtained from here: + + http://www.bisente.com/proyectos/easy-rsa-subjectaltname/ + +INSTALL easy-rsa + +1. Edit vars. +2. Set KEY_CONFIG to point to the correct openssl-<version>.cnf + file included in this distribution. +3. Set KEY_DIR to point to a directory which will + contain all keys, certificates, etc. This + directory need not exist, and if it does, + it will be deleted with rm -rf, so BE + CAREFUL how you set KEY_DIR. +4. (Optional) Edit other fields in vars + per your site data. You may want to + increase KEY_SIZE to 2048 if you are + paranoid and don't mind slower key + processing, but certainly 1024 is + fine for testing purposes. KEY_SIZE + must be compatible across both peers + participating in a secure SSL/TLS + connection. +5. (Optional) If you intend to use PKCS#11, + install openssl >= 0.9.7, install the + following components from www.opensc.org: + - opensc >= 0.10.0 + - engine_pkcs11 >= 0.1.3 + Update the openssl.cnf to load the engine: + - Uncomment pkcs11 under engine_section. + - Validate path at dynamic_path under pkcs11_section. +6. . vars +7. ./clean-all +8. As you create certificates, keys, and + certificate signing requests, understand that + only .key files should be kept confidential. + .crt and .csr files can be sent over insecure + channels such as plaintext email. + +IMPORTANT + +To avoid a possible Man-in-the-Middle attack where an authorized +client tries to connect to another client by impersonating the +server, make sure to enforce some kind of server certificate +verification by clients. There are currently four different ways +of accomplishing this, listed in the order of preference: + +(1) Build your server certificates with specific key usage and + extended key usage. The RFC3280 determine that the following + attributes should be provided for TLS connections: + + Mode Key usage Extended key usage + --------------------------------------------------------------------------- + Client digitalSignature TLS Web Client Authentication + keyAgreement + digitalSignature, keyAgreement + + Server digitalSignature, keyEncipherment TLS Web Server Authentication + digitalSignature, keyAgreement + + Now add the following line to your client configuration: + + remote-cert-tls server + + This will block clients from connecting to any + server which lacks the required extension designation + in its certificate, even if the certificate has been + signed by the CA which is cited in the OpenVPN configuration + file (--ca directive). + +(3) Use the --tls-remote directive on the client to + accept/reject the server connection based on the common + name of the server certificate. + +(3) Use a --tls-verify script or plugin to accept/reject the + server connection based on a custom test of the server + certificate's embedded X509 subject details. + +(4) Sign server certificates with one CA and client certificates + with a different CA. The client config "ca" directive should + reference the server-signing CA while the server config "ca" + directive should reference the client-signing CA. + +NOTES + +Show certificate fields: + openssl x509 -in cert.crt -text + +PKITOOL documentation + +pkitool 2.0 +Usage: pkitool [options...] [common-name] +Options: + --batch : batch mode (default) + --keysize : Set keysize + size : size (default=1024) + --interact : interactive mode + --server : build server cert + --initca : build root CA + --inter : build intermediate CA + --pass : encrypt private key with password + --csr : only generate a CSR, do not sign + --sign : sign an existing CSR + --pkcs12 : generate a combined PKCS#12 file + --pkcs11 : generate certificate on PKCS#11 token + lib : PKCS#11 library + slot : PKCS#11 slot + id : PKCS#11 object id (hex string) + label : PKCS#11 object label +Standalone options: + --pkcs11-slots : list PKCS#11 slots + lib : PKCS#11 library + --pkcs11-objects : list PKCS#11 token objects + lib : PKCS#11 library + slot : PKCS#11 slot + --pkcs11-init : initialize PKCS#11 token DANGEROUS!!! + lib : PKCS#11 library + slot : PKCS#11 slot + label : PKCS#11 token label +Notes: + Please edit the vars script to reflect your configuration, + then source it with "source ./vars". + Next, to start with a fresh PKI configuration and to delete any + previous certificates and keys, run "./clean-all". + Finally, you can run this tool (pkitool) to build certificates/keys. + In order to use PKCS#11 interface you must have opensc-0.10.0 or higher. +Generated files and corresponding OpenVPN directives: +(Files will be placed in the $KEY_DIR directory, defined in ./vars) + ca.crt -> root certificate (--ca) + ca.key -> root key, keep secure (not directly used by OpenVPN) + .crt files -> client/server certificates (--cert) + .key files -> private keys, keep secure (--key) + .csr files -> certificate signing request (not directly used by OpenVPN) + dh1024.pem or dh2048.pem -> Diffie Hellman parameters (--dh) +Examples: + pkitool --initca -> Build root certificate + pkitool --initca --pass -> Build root certificate with password-protected key + pkitool --server server1 -> Build "server1" certificate/key + pkitool client1 -> Build "client1" certificate/key + pkitool --pass client2 -> Build password-protected "client2" certificate/key + pkitool --pkcs12 client3 -> Build "client3" certificate/key in PKCS#12 format + pkitool --csr client4 -> Build "client4" CSR to be signed by another CA + pkitool --sign client4 -> Sign "client4" CSR + pkitool --inter interca -> Build an intermediate key-signing certificate/key + Also see ./inherit-inter script. + pkitool --pkcs11 /usr/lib/pkcs11/lib1 0 010203 "client5 id" client5 + -> Build "client5" certificate/key in PKCS#11 token +Typical usage for initial PKI setup. Build myserver, client1, and client2 cert/keys. +Protect client2 key with a password. Build DH parms. Generated files in ./keys : + [edit vars with your site-specific info] + source ./vars + ./clean-all + ./build-dh -> takes a long time, consider backgrounding + ./pkitool --initca + ./pkitool --server myserver + ./pkitool client1 + ./pkitool --pass client2 +Typical usage for adding client cert to existing PKI: + source ./vars + ./pkitool client-new diff --git a/easy-rsa/1.0/README b/easy-rsa/1.0/README deleted file mode 100644 index fd424ef..0000000 --- a/easy-rsa/1.0/README +++ /dev/null @@ -1,161 +0,0 @@ -This is a small RSA key management package, -based on the openssl command line tool, that -can be found in the easy-rsa subdirectory -of the OpenVPN distribution. - -These are reference notes. For step -by step instructions, see the HOWTO: - -http://openvpn.net/howto.html - -INSTALL - -1. Edit vars. -2. Set KEY_CONFIG to point to the openssl.cnf file - included in this distribution. -3. Set KEY_DIR to point to a directory which will - contain all keys, certificates, etc. This - directory need not exist, and if it does, - it will be deleted with rm -rf, so BE - CAREFUL how you set KEY_DIR. -4. (Optional) Edit other fields in vars - per your site data. You may want to - increase KEY_SIZE to 2048 if you are - paranoid and don't mind slower key - processing, but certainly 1024 is - fine for testing purposes. KEY_SIZE - must be compatible across both peers - participating in a secure SSL/TLS - connection. -5 . vars -6. ./clean-all -7. As you create certificates, keys, and - certificate signing requests, understand that - only .key files should be kept confidential. - .crt and .csr files can be sent over insecure - channels such as plaintext email. -8. You should never need to copy a .key file - between computers. Normally each computer - will have its own certificate/key pair. - -BUILD YOUR OWN ROOT CERTIFICATE AUTHORITY (CA) CERTIFICATE/KEY - -1. ./build-ca -2. ca.crt and ca.key will be built in your KEY_DIR - directory - -BUILD AN INTERMEDIATE CERTIFICATE AUTHORITY CERTIFICATE/KEY (optional) - -1. ./build-inter inter -2. inter.crt and inter.key will be built in your KEY_DIR - directory and signed with your root certificate. - -BUILD DIFFIE-HELLMAN PARAMETERS (necessary for -the server end of a SSL/TLS connection). - -1. ./build-dh - -BUILD A CERTIFICATE SIGNING REQUEST (If -you want to sign your certificate with a root -certificate controlled by another individual -or organization, or residing on a different machine). - -1. Get ca.crt (the root certificate) from your - certificate authority. Though this - transfer can be over an insecure channel, to prevent - man-in-the-middle attacks you must confirm that - ca.crt was not tampered with. Large CAs solve this - problem by hardwiring their root certificates into - popular web browsers. A simple way to verify a root - CA is to call the issuer on the telephone and confirm - that the md5sum or sha1sum signatures on the ca.crt - files match (such as with the command: "md5sum ca.crt"). -2. Choose a name for your certificate such as your computer - name. In our example we will use "mycert". -3. ./build-req mycert -4. You can ignore most of the fields, but set - "Common Name" to something unique such as your - computer's host name. Leave all password - fields blank, unless you want your private key - to be protected by password. Using a password - is not required -- it will make your key more secure - but also more inconvenient to use, because you will - need to supply your password anytime the key is used. - NOTE: if you are using a password, use ./build-req-pass - instead of ./build-req -5. Your key will be written to $KEY_DIR/mycert.key -6. Your certificate signing request will be written to - to $KEY_DIR/mycert.csr -7. Email mycert.csr to the individual or organization - which controls the root certificate. This can be - done over an insecure channel. -8. After the .csr file is signed by the root certificate - authority, you will receive a file mycert.crt - (your certificate). Place mycert.crt in your - KEY_DIR directory. -9. The combined files of mycert.crt, mycert.key, - and ca.crt can now be used to secure one end of - an SSL/TLS connection. - -SIGN A CERTIFICATE SIGNING REQUEST - -1. ./sign-req mycert -2. mycert.crt will be built in your KEY_DIR - directory using mycert.csr and your root CA - file as input. - -BUILD AND SIGN A CERTIFICATE SIGNING REQUEST -USING A LOCALLY INSTALLED ROOT CERTIFICATE/KEY -- this -script generates and signs a certificate in one step, -but it requires that the generated certificate and private -key files be copied to the destination host over a -secure channel. - -1. ./build-key mycert (no password protection) -2. OR ./build-key-pass mycert (with password protection) -3. OR ./build-key-pkcs12 mycert (PKCS #12 format) -4. OR ./build-key-server mycert (with nsCertType=server) -5. mycert.crt and mycert.key will be built in your - KEY_DIR directory, and mycert.crt will be signed - by your root CA. If ./build-key-pkcs12 was used a - mycert.p12 file will also be created including the - private key, certificate and the ca certificate. - -IMPORTANT - -To avoid a possible Man-in-the-Middle attack where an authorized -client tries to connect to another client by impersonating the -server, make sure to enforce some kind of server certificate -verification by clients. There are currently four different ways -of accomplishing this, listed in the order of preference: - -(1) Build your server certificates with the build-key-server - script. This will designate the certificate as a - server-only certificate by setting nsCertType=server. - Now add the following line to your client configuration: - - ns-cert-type server - - This will block clients from connecting to any - server which lacks the nsCertType=server designation - in its certificate, even if the certificate has been - signed by the CA which is cited in the OpenVPN configuration - file (--ca directive). - -(2) Use the --tls-remote directive on the client to - accept/reject the server connection based on the common - name of the server certificate. - -(3) Use a --tls-verify script or plugin to accept/reject the - server connection based on a custom test of the server - certificate's embedded X509 subject details. - -(4) Sign server certificates with one CA and client certificates - with a different CA. The client config "ca" directive should - reference the server-signing CA while the server config "ca" - directive should reference the client-signing CA. - -NOTES - -Show certificate fields: - openssl x509 -in cert.crt -text diff --git a/easy-rsa/2.0/README b/easy-rsa/2.0/README deleted file mode 100644 index 6f5395c..0000000 --- a/easy-rsa/2.0/README +++ /dev/null @@ -1,229 +0,0 @@ -EASY-RSA Version 2.0-rc1 - -This is a small RSA key management package, based on the openssl -command line tool, that can be found in the easy-rsa subdirectory -of the OpenVPN distribution. While this tool is primary concerned -with key management for the SSL VPN application space, it can also -be used for building web certificates. - -These are reference notes. For step-by-step instructions, see the -HOWTO: - -http://openvpn.net/howto.html - -This package is based on the ./pkitool script. Run ./pkitool -without arguments for a detailed help message (which is also pasted -below). - -Release Notes for easy-rsa-2.0 - -* Most functionality has been consolidated into the pkitool - script. For compatibility, all previous scripts from 1.0 such - as build-key and build-key-server are provided as stubs - which call pkitool to do the real work. - -* pkitool has a --batch flag (enabled by default) which generates - keys/certs without needing any interactive input. pkitool - can still generate certs/keys using interactive prompting by - using the --interact flag. - -* The inherit-inter script has been provided for creating - a new PKI rooted on an intermediate certificate built within a - higher-level PKI. See comments in the inherit-inter script - for more info. - -* The openssl.cnf file has been modified. pkitool will not - work with the openssl.cnf file included with previous - easy-rsa releases. - -* The vars file has been modified -- the following extra - variables have been added: EASY_RSA, CA_EXPIRE, - KEY_EXPIRE. - -* The make-crl and revoke-crt scripts have been removed and - are replaced by the revoke-full script. - -* The "Organizational Unit" X509 field can be set using - the KEY_OU environmental variable before calling pkitool. - -* This release only affects the Linux/Unix version of easy-rsa. - The Windows version (written to use the Windows shell) is unchanged. - -* Use the revoke-full script to revoke a certificate, and generate - (or update) the crl.pem file in the keys directory (as set by the - vars script). Then use "crl-verify crl.pem" in your OpenVPN server - config file, so that OpenVPN can reject any connections coming from - clients which present a revoked certificate. Usage for the script is: - - revoke-full <common-name> - - Note this this procedure is primarily designed to revoke client - certificates. You could theoretically use this method to revoke - server certificates as well, but then you would need to propagate - the crl.pem file to all clients as well, and have them include - "crl-verify crl.pem" in their configuration files. - -* PKCS#11 support was added. - -* For those interested in using this tool to generate web certificates, - A variant of the easy-rsa package that allows the creation of multi-domain - certificates with subjectAltName can be obtained from here: - - http://www.bisente.com/proyectos/easy-rsa-subjectaltname/ - -INSTALL easy-rsa - -1. Edit vars. -2. Set KEY_CONFIG to point to the correct openssl-<version>.cnf - file included in this distribution. -3. Set KEY_DIR to point to a directory which will - contain all keys, certificates, etc. This - directory need not exist, and if it does, - it will be deleted with rm -rf, so BE - CAREFUL how you set KEY_DIR. -4. (Optional) Edit other fields in vars - per your site data. You may want to - increase KEY_SIZE to 2048 if you are - paranoid and don't mind slower key - processing, but certainly 1024 is - fine for testing purposes. KEY_SIZE - must be compatible across both peers - participating in a secure SSL/TLS - connection. -5. (Optional) If you intend to use PKCS#11, - install openssl >= 0.9.7, install the - following components from www.opensc.org: - - opensc >= 0.10.0 - - engine_pkcs11 >= 0.1.3 - Update the openssl.cnf to load the engine: - - Uncomment pkcs11 under engine_section. - - Validate path at dynamic_path under pkcs11_section. -6. . vars -7. ./clean-all -8. As you create certificates, keys, and - certificate signing requests, understand that - only .key files should be kept confidential. - .crt and .csr files can be sent over insecure - channels such as plaintext email. - -IMPORTANT - -To avoid a possible Man-in-the-Middle attack where an authorized -client tries to connect to another client by impersonating the -server, make sure to enforce some kind of server certificate -verification by clients. There are currently four different ways -of accomplishing this, listed in the order of preference: - -(1) Build your server certificates with specific key usage and - extended key usage. The RFC3280 determine that the following - attributes should be provided for TLS connections: - - Mode Key usage Extended key usage - --------------------------------------------------------------------------- - Client digitalSignature TLS Web Client Authentication - keyAgreement - digitalSignature, keyAgreement - - Server digitalSignature, keyEncipherment TLS Web Server Authentication - digitalSignature, keyAgreement - - Now add the following line to your client configuration: - - remote-cert-tls server - - This will block clients from connecting to any - server which lacks the required extension designation - in its certificate, even if the certificate has been - signed by the CA which is cited in the OpenVPN configuration - file (--ca directive). - -(3) Use the --tls-remote directive on the client to - accept/reject the server connection based on the common - name of the server certificate. - -(3) Use a --tls-verify script or plugin to accept/reject the - server connection based on a custom test of the server - certificate's embedded X509 subject details. - -(4) Sign server certificates with one CA and client certificates - with a different CA. The client config "ca" directive should - reference the server-signing CA while the server config "ca" - directive should reference the client-signing CA. - -NOTES - -Show certificate fields: - openssl x509 -in cert.crt -text - -PKITOOL documentation - -pkitool 2.0 -Usage: pkitool [options...] [common-name] -Options: - --batch : batch mode (default) - --keysize : Set keysize - size : size (default=1024) - --interact : interactive mode - --server : build server cert - --initca : build root CA - --inter : build intermediate CA - --pass : encrypt private key with password - --csr : only generate a CSR, do not sign - --sign : sign an existing CSR - --pkcs12 : generate a combined PKCS#12 file - --pkcs11 : generate certificate on PKCS#11 token - lib : PKCS#11 library - slot : PKCS#11 slot - id : PKCS#11 object id (hex string) - label : PKCS#11 object label -Standalone options: - --pkcs11-slots : list PKCS#11 slots - lib : PKCS#11 library - --pkcs11-objects : list PKCS#11 token objects - lib : PKCS#11 library - slot : PKCS#11 slot - --pkcs11-init : initialize PKCS#11 token DANGEROUS!!! - lib : PKCS#11 library - slot : PKCS#11 slot - label : PKCS#11 token label -Notes: - Please edit the vars script to reflect your configuration, - then source it with "source ./vars". - Next, to start with a fresh PKI configuration and to delete any - previous certificates and keys, run "./clean-all". - Finally, you can run this tool (pkitool) to build certificates/keys. - In order to use PKCS#11 interface you must have opensc-0.10.0 or higher. -Generated files and corresponding OpenVPN directives: -(Files will be placed in the $KEY_DIR directory, defined in ./vars) - ca.crt -> root certificate (--ca) - ca.key -> root key, keep secure (not directly used by OpenVPN) - .crt files -> client/server certificates (--cert) - .key files -> private keys, keep secure (--key) - .csr files -> certificate signing request (not directly used by OpenVPN) - dh1024.pem or dh2048.pem -> Diffie Hellman parameters (--dh) -Examples: - pkitool --initca -> Build root certificate - pkitool --initca --pass -> Build root certificate with password-protected key - pkitool --server server1 -> Build "server1" certificate/key - pkitool client1 -> Build "client1" certificate/key - pkitool --pass client2 -> Build password-protected "client2" certificate/key - pkitool --pkcs12 client3 -> Build "client3" certificate/key in PKCS#12 format - pkitool --csr client4 -> Build "client4" CSR to be signed by another CA - pkitool --sign client4 -> Sign "client4" CSR - pkitool --inter interca -> Build an intermediate key-signing certificate/key - Also see ./inherit-inter script. - pkitool --pkcs11 /usr/lib/pkcs11/lib1 0 010203 "client5 id" client5 - -> Build "client5" certificate/key in PKCS#11 token -Typical usage for initial PKI setup. Build myserver, client1, and client2 cert/keys. -Protect client2 key with a password. Build DH parms. Generated files in ./keys : - [edit vars with your site-specific info] - source ./vars - ./clean-all - ./build-dh -> takes a long time, consider backgrounding - ./pkitool --initca - ./pkitool --server myserver - ./pkitool client1 - ./pkitool --pass client2 -Typical usage for adding client cert to existing PKI: - source ./vars - ./pkitool client-new -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- .gitignore | 9 ++ COPYING | 42 ++++++ COPYRIGHT.GPL | 339 +++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 48 +++++++ configure.ac | 51 ++++++++ easy-rsa/2.0/Makefile | 13 -- 6 files changed, 489 insertions(+), 13 deletions(-) create mode 100644 .gitignore create mode 100644 COPYING create mode 100644 COPYRIGHT.GPL create mode 100644 Makefile.am create mode 100644 configure.ac delete mode 100644 easy-rsa/2.0/Makefile diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bf7b5da --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +aclocal.m4 +autom4te.cache +configure +install-sh +missing +config.log +config.status +Makefile.in +Makefile diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..fcdfffd --- /dev/null +++ b/COPYING @@ -0,0 +1,42 @@ +OpenVPN (TM) -- An Open Source VPN daemon + +Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sa...@op...> + +This distribution contains multiple components, some +of which fall under different licenses. By using OpenVPN +or any of the bundled components enumerated below, you +agree to be bound by the conditions of the license for +each respective component. + +OpenVPN trademark +----------------- + + "OpenVPN" is a trademark of OpenVPN Technologies, Inc. + + +OpenVPN license: +---------------- + + OpenVPN is distributed under the GPL license version 2 (see Below). + + Special exception for linking OpenVPN with OpenSSL: + + In addition, as a special exception, OpenVPN Technologies, Inc. gives + permission to link the code of this program with the OpenSSL + library (or with modified versions of OpenSSL that use the same + license as OpenSSL), and distribute linked combinations including + the two. You must obey the GNU General Public License in all + respects for all of the code used other than OpenSSL. If you modify + this file, you may extend this exception to your version of the + file, but you are not obligated to do so. If you do not wish to + do so, delete this exception statement from your version. + +GNU Public License (GPL) +------------------------ + + OpenVPN, LZO, and the TAP-Win32 distributions are + licensed under the GPL version 2 (see COPYRIGHT.GPL). + + In the Windows binary distribution of OpenVPN, the + GPL is reproduced below. + diff --git a/COPYRIGHT.GPL b/COPYRIGHT.GPL new file mode 100644 index 0000000..ff8a7f0 --- /dev/null +++ b/COPYRIGHT.GPL @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 + as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..f6433d5 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,48 @@ +# +# Easy-RSA -- This is a small RSA key management package, based on the openssl +# command line tool, that can be found in the easy-rsa subdirectory +# of the OpenVPN distribution. While this tool is primary concerned +# with key management for the SSL VPN application space, it can also +# be used for building web certificates. +# +# Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sa...@op...> +# Copyright (C) 2006-2012 Alon Bar-Lev <alo...@gm...> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program (see the file COPYING included with this +# distribution); if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +AUTOMAKE_OPTIONS = foreign 1.9 + +MAINTAINERCLEANFILES = \ +	config.log config.status \ +	$(srcdir)/Makefile.in \ +	$(srcdir)/configure \ +	$(srcdir)/missing $(srcdir)/install-sh \ +	$(srcdir)/depcomp $(srcdir)/aclocal.m4 \ +	$(srcdir)/config.guess $(srcdir)/config.sub + +EXTRA_DIST = easy-rsa + +dist_doc_DATA = \ +	COPYRIGHT.GPL \ +	COPYING + +dist_easyrsa_DATA = + +install-data-local:	install-dist_easyrsaDATA +	cp "$(srcdir)/easy-rsa/2.0"/* "$(DESTDIR)$(easyrsadir)" + +uninstall-local: +	-rm -fr "$(DESTDIR)$(easyrsadir)" diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..f9625e5 --- /dev/null +++ b/configure.ac @@ -0,0 +1,51 @@ +# +# Easy-RSA -- This is a small RSA key management package, based on the openssl +# command line tool, that can be found in the easy-rsa subdirectory +# of the OpenVPN distribution. While this tool is primary concerned +# with key management for the SSL VPN application space, it can also +# be used for building web certificates. +# +# Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sa...@op...> +# Copyright (C) 2006-2012 Alon Bar-Lev <alo...@gm...> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program (see the file COPYING included with this +# distribution); if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +dnl Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.59) + +AC_INIT([easy-rsa], [2.1.0], [ope...@li...]) + +AC_CONFIG_SRCDIR([./easy-rsa/2.0/build-key-pass]) +AM_INIT_AUTOMAKE + +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET + +AC_ARG_WITH( +	[easyrsadir], +	[AS_HELP_STRING([--with-easyrsadir], [specify easyrsadir @<:@default=DATADIR/easy-rsa@:>@])], +	[easyrsadir="${withval}"], +	[easyrsadir="\$(datadir)/easy-rsa"] +) + +AC_SUBST([easyrsadir]) + +AC_CONFIG_FILES([ +	Makefile +]) +AC_OUTPUT diff --git a/easy-rsa/2.0/Makefile b/easy-rsa/2.0/Makefile deleted file mode 100644 index 8000cc5..0000000 --- a/easy-rsa/2.0/Makefile +++ /dev/null @@ -1,13 +0,0 @@ - -DESTDIR= -PREFIX= - -all: -	echo "All done." -	echo "Run make install DESTDIR=/usr/share/somewhere" - -install: -	install -d "${DESTDIR}/${PREFIX}" -	install -m 0755 build-* "${DESTDIR}/${PREFIX}" -	install -m 0755 clean-all list-crl inherit-inter pkitool revoke-full sign-req whichopensslcnf "${DESTDIR}/${PREFIX}" -	install -m 0644 openssl-0.9.6.cnf openssl-0.9.8.cnf openssl-1.0.0.cnf README vars "${DESTDIR}/${PREFIX}" -- 1.7.3.4 

1. Make easy-rsa standalone package. 2. Package. 3. Add spec file. Alon Bar-Lev (4): cleanup: fix execute permission build: simple autotools build build: doc packaging: rpm: initial add .gitignore | 9 + COPYING | 42 +++++ COPYRIGHT.GPL | 339 ++++++++++++++++++++++++++++++++++++++ Makefile.am | 50 ++++++ configure.ac | 55 ++++++ distro/Makefile.am | 15 ++ distro/rpm/Makefile.am | 15 ++ distro/rpm/easy-rsa.spec.in | 68 ++++++++ doc/Makefile.am | 16 ++ doc/README-1.0 | 161 ++++++++++++++++++ doc/README-2.0 | 229 +++++++++++++++++++++++++ easy-rsa/1.0/README | 161 ------------------ easy-rsa/2.0/Makefile | 13 -- easy-rsa/2.0/README | 229 ------------------------- 14 files changed, 999 insertions(+), 403 deletions(-) create mode 100644 .gitignore create mode 100644 COPYING create mode 100644 COPYRIGHT.GPL create mode 100644 Makefile.am create mode 100644 configure.ac create mode 100644 distro/Makefile.am create mode 100644 distro/rpm/Makefile.am create mode 100644 distro/rpm/easy-rsa.spec.in create mode 100644 doc/Makefile.am create mode 100644 doc/README-1.0 create mode 100644 doc/README-2.0 delete mode 100644 easy-rsa/1.0/README mode change 100644 => 100755 easy-rsa/1.0/list-crl mode change 100644 => 100755 easy-rsa/1.0/make-crl mode change 100644 => 100755 easy-rsa/1.0/revoke-crt delete mode 100644 easy-rsa/2.0/Makefile delete mode 100644 easy-rsa/2.0/README mode change 100755 => 100644 easy-rsa/2.0/openssl-0.9.6.cnf mode change 100755 => 100644 easy-rsa/2.0/openssl-0.9.8.cnf mode change 100755 => 100644 easy-rsa/2.0/openssl-1.0.0.cnf mode change 100755 => 100644 easy-rsa/2.0/vars mode change 100755 => 100644 easy-rsa/Windows/init-config.bat -- 1.7.3.4 

 Signed-off-by: Alon Bar-Lev <alo...@gm...> --- OpenVPN GUI ReadMe.txt | 462 ++++++++++++++++++++++++------------------------ 1 files changed, 231 insertions(+), 231 deletions(-) diff --git a/OpenVPN GUI ReadMe.txt b/OpenVPN GUI ReadMe.txt index f650357..323361b 100644 --- a/OpenVPN GUI ReadMe.txt +++ b/OpenVPN GUI ReadMe.txt @@ -1,231 +1,231 @@ -Installation Instructions for OpenVPN GUI for Windows ------------------------------------------------------ - -You can either get my installation package for OpenVPN 2.0.X where I've -bundled the gui in the installation package, or you can use the original -installation package from OpenVPN, and then manually install OpenVPN GUI. - - -Installation using the bundled OpenVPN package with OpenVPN GUI included ------------------------------------------------------------------------- - -* Download openvpn-2.0.X-gui-1.0.X-install.exe from - http://openvpn.se - -* If you have a previous version of OpenVPN GUI installed, shut it down. - Make sure it's closed by ALL logged on users. - -* Run the install program. During the installation you can choose if the GUI - should be started automatically at system startup. The default is yes. - -* Create a xxxx.ovpn config-file with your favorite texteditor and save it in: - C:\Program files\OpenVPN\config\. You should NOT use the "log" or "log-append" - options as OpenVPN GUI redirect the normal output to a log file itself. - There is a sample config files in the "sample-config" folder. Please - refer to the OpenVPN project homepage for more information regarding - creating the configuration file. http://openvpn.net/ - - -Manual installation of OpenVPN GUI ----------------------------------- - -* Download and install OpenVPN from http://openvpn.net/ - -* Download openvpn-gui-1.0.X.exe and save it in OpenVPN's bin folder. - Default is "C:\Program Files\OpenVPN\bin\". You must put it in this folder - because OpenVPN GUI depends on the OpenSSL DLLs installed in this folder by - OpenVPN. - -* Create a xxxx.ovpn config-file with your favorite texteditor and save it in: - C:\Program files\OpenVPN\config\. You should NOT use the "log" or "log-append" - options as OpenVPN GUI redirect the normal output to a log file itself. - There is a sample config files in the "sample-config" folder. Please - refer to the OpenVPN project homepage for more information regarding - creating the configuration file. http://openvpn.net/ - -* Put a short-cut to openvpn-gui-1.0-X.exe in your - "Start->All Program->StartUp" folder if you want the gui started automatically - when you logon to Windows. - -* Start the GUI by double-clicking the openvpn-gui-1.0.X.exe file. - -*** You need to be Administrator the first time you run OpenVPN GUI for it to - create its registry keys. After that you don't have to be administrator - just to run the GUI, however OpenVPN requires the user to be - administrator to run! *** - - -Using OpenVPN GUI ------------------ - -When OpenVPN GUI is started your config folder (C:\Program Files\OpenVPN\config) -will be scanned for .ovpn files, and an icon will be displayed in the taskbar's -status area. - -If you do not have any openvpn connection running, the config dir will be -re-scanned for new config files every time you open the OpenVPN GUI menu by -right-clicking the icon. - -When you choose to connect to a site OpenVPN GUI will launch openvpn with -the specified config file. If you use a passphrase protected key you will be -prompted for the passphrase. - -If you want OpenVPN GUI to start a connection automatically when it's started, -you can use the --connect cmd-line option. You have to include the extention -for the config file. Example: - -openvpn-gui --connect office.ovpn - - -Run OpenVPN GUI as a Non-Admin user ------------------------------------ - -OpenVPN currently does not work as a normal (non-admin) user. OpenVPN GUI -2.0 will solve this by using an enhanced version of the OpenVPN service -to start and stop openvpn processes. - -In the mean time, it is possible to use OpenVPN GUI to control the current -OpenVPN Service to start and stop a connection. - -To use OpenVPN GUI to control the OpenVPN service, set the registry value -"service_only" to '1'. See the section about registry values below. - -Limitations with this way: - - There is no way for OpenVPN GUI ta hand over a password to the service - wrapper, so you can't use passphrase protected private keys or - username/password authentication. - - If you have multiple openvpn configurations, all will be started and - stopped at the same time. - - OpenVPN GUI is not able to retrieve any status info about the connections - from OpenVPN, so it will report connected as soon as the service is - started regarless of if OpenVPN has really succeded to connect or not. - - You cannot see the OpenVPN log in real-time. - - -Run Connect/Disconnect/Preconnect Scripts ------------------------------------------ - -There are three diffrent scripts that OpenVPN GUI can execute to help -with diffrent tasks like mapping network drives. - -Preconnect If a file named "xxx_pre.bat" exist in the config folder - where xxx is the same as your OpenVPN config file name, - this will be executed BEFORE the OpenVPN tunnel is established. - -Connect If a file named "xxx_up.bat" exist in the config folder - where xxx is the same as your OpenVPN config file name, - this will be executed AFTER the OpenVPN tunnel is established. - -Disconnect If a file named "xxx_down.bat" exist in the config folder - where xxx is the same as your OpenVPN config file name, - this will be executed BEFORE the OpenVPN tunnel is closed. - - -Registry Values affecting the OpenVPN GUI operation ---------------------------------------------------- - -All OpenVPN GUI reg-values are located below the following key: -HKEY_LOCAL_MACHINE\SOFTWARE\OpenVPN-GUI\ - -The follow keys are used to control the OpenVPN GUI - -config_dir - configuration file directory, defaults to "C:\Program Files\OpenVPN\config" - -config_ext - file extension on configuration files, defaults to "ovpn" - -connectscript_timeout - Time in seconds to wait for the connect script to finish. If set to 0 - the exitcode of the script is not checked. - -disconnectscript_timeout - Time in seconds to wait for the disconnect script to finish. Must be a - value between 1-99. - -preconnectscript_timeout - Time in seconds to wait for the preconnect script to finish. Must be a - value between 1-99. - -exe_path - path to openvpn.exe, defaults to "C:\Program Files\OpenVPN\bin\openvpn.exe" - -log_dir - log file directory, defaults to "C:\Program Files\OpenVPN\log" - -log_append - if set to "0", the log file will be truncated every time you start a - connection. If set to "1", the log will be appended to the log file. - -priority - the windows priority class for each instantiated OpenVPN process, - can be one of: - - * "IDLE_PRIORITY_CLASS" - * "BELOW_NORMAL_PRIORITY_CLASS" - * "NORMAL_PRIORITY_CLASS" (default) - * "ABOVE_NORMAL_PRIORITY_CLASS" - * "HIGH_PRIORITY_CLASS" - -allow_edit - If set to "1", the Edit config menu will be showed. - -allow_password - If set to "1", the Change Password menu will be showed. - -allow_proxy - If set to "1", the Proxy Settings menu will be showed. - -allow_service - If set to "1", the Service control menu will be showed. - -silent_connection - If set to "1", the status window with the OpenVPN log output will - not be showed while connecting. - -service_only - If set to "1", OpenVPN GUI's normal "Connect" and "Disconnect" - actions are changed so they start/stop the OpenVPN service instead - of launching openvpn.exe directly. - -show_balloon - If set to "0" - Never show any connected balloon. - "1" - Show balloon after initial connection is established. - "2" - Show balloon even after re-connects. -log_viewer - The program used to view your log files, defaults to - "C:\windows\notepad.exe" - -editor - The program used to edit your config files, defaults to - "C:\windows\notepad.exe" - -passphrase_attempts - Number of attempts to enter the passphrase to allow. - -All these registry options is also available as cmd-line options. -Use "openvpn-gui --help" for more info about cmd-line options. - - -If you have any problem getting OpenVPN GUI to work you can reach me via -email at ma...@ni.... - - -Building OpenVPN GUI from source --------------------------------- - -* Download and install MinGW and MSYS from http://www.mingw.org/ - I'm using MinGW-3.2.0-rc-3 and MSYS-1.0.10. - -* Download and install the binary distribution of OpenSSL from - http://www.slproweb.com/products/Win32OpenSSL.html - -* Download and extract the OpenVPN GUI source archive. - -* Start a bash shell by running msys.bat. - -* Run "make" from the OpenVPN GUI source directory. +Installation Instructions for OpenVPN GUI for Windows +----------------------------------------------------- + +You can either get my installation package for OpenVPN 2.0.X where I've +bundled the gui in the installation package, or you can use the original +installation package from OpenVPN, and then manually install OpenVPN GUI. + + +Installation using the bundled OpenVPN package with OpenVPN GUI included +------------------------------------------------------------------------ + +* Download openvpn-2.0.X-gui-1.0.X-install.exe from + http://openvpn.se + +* If you have a previous version of OpenVPN GUI installed, shut it down. + Make sure it's closed by ALL logged on users. + +* Run the install program. During the installation you can choose if the GUI + should be started automatically at system startup. The default is yes. + +* Create a xxxx.ovpn config-file with your favorite texteditor and save it in: + C:\Program files\OpenVPN\config\. You should NOT use the "log" or "log-append" + options as OpenVPN GUI redirect the normal output to a log file itself. + There is a sample config files in the "sample-config" folder. Please + refer to the OpenVPN project homepage for more information regarding + creating the configuration file. http://openvpn.net/ + + +Manual installation of OpenVPN GUI +---------------------------------- + +* Download and install OpenVPN from http://openvpn.net/ + +* Download openvpn-gui-1.0.X.exe and save it in OpenVPN's bin folder. + Default is "C:\Program Files\OpenVPN\bin\". You must put it in this folder + because OpenVPN GUI depends on the OpenSSL DLLs installed in this folder by + OpenVPN. + +* Create a xxxx.ovpn config-file with your favorite texteditor and save it in: + C:\Program files\OpenVPN\config\. You should NOT use the "log" or "log-append" + options as OpenVPN GUI redirect the normal output to a log file itself. + There is a sample config files in the "sample-config" folder. Please + refer to the OpenVPN project homepage for more information regarding + creating the configuration file. http://openvpn.net/ + +* Put a short-cut to openvpn-gui-1.0-X.exe in your + "Start->All Program->StartUp" folder if you want the gui started automatically + when you logon to Windows. + +* Start the GUI by double-clicking the openvpn-gui-1.0.X.exe file. + +*** You need to be Administrator the first time you run OpenVPN GUI for it to + create its registry keys. After that you don't have to be administrator + just to run the GUI, however OpenVPN requires the user to be + administrator to run! *** + + +Using OpenVPN GUI +----------------- + +When OpenVPN GUI is started your config folder (C:\Program Files\OpenVPN\config) +will be scanned for .ovpn files, and an icon will be displayed in the taskbar's +status area. + +If you do not have any openvpn connection running, the config dir will be +re-scanned for new config files every time you open the OpenVPN GUI menu by +right-clicking the icon. + +When you choose to connect to a site OpenVPN GUI will launch openvpn with +the specified config file. If you use a passphrase protected key you will be +prompted for the passphrase. + +If you want OpenVPN GUI to start a connection automatically when it's started, +you can use the --connect cmd-line option. You have to include the extention +for the config file. Example: + +openvpn-gui --connect office.ovpn + + +Run OpenVPN GUI as a Non-Admin user +----------------------------------- + +OpenVPN currently does not work as a normal (non-admin) user. OpenVPN GUI +2.0 will solve this by using an enhanced version of the OpenVPN service +to start and stop openvpn processes. + +In the mean time, it is possible to use OpenVPN GUI to control the current +OpenVPN Service to start and stop a connection. + +To use OpenVPN GUI to control the OpenVPN service, set the registry value +"service_only" to '1'. See the section about registry values below. + +Limitations with this way: + + There is no way for OpenVPN GUI ta hand over a password to the service + wrapper, so you can't use passphrase protected private keys or + username/password authentication. + + If you have multiple openvpn configurations, all will be started and + stopped at the same time. + + OpenVPN GUI is not able to retrieve any status info about the connections + from OpenVPN, so it will report connected as soon as the service is + started regarless of if OpenVPN has really succeded to connect or not. + + You cannot see the OpenVPN log in real-time. + + +Run Connect/Disconnect/Preconnect Scripts +----------------------------------------- + +There are three diffrent scripts that OpenVPN GUI can execute to help +with diffrent tasks like mapping network drives. + +Preconnect If a file named "xxx_pre.bat" exist in the config folder + where xxx is the same as your OpenVPN config file name, + this will be executed BEFORE the OpenVPN tunnel is established. + +Connect If a file named "xxx_up.bat" exist in the config folder + where xxx is the same as your OpenVPN config file name, + this will be executed AFTER the OpenVPN tunnel is established. + +Disconnect If a file named "xxx_down.bat" exist in the config folder + where xxx is the same as your OpenVPN config file name, + this will be executed BEFORE the OpenVPN tunnel is closed. + + +Registry Values affecting the OpenVPN GUI operation +--------------------------------------------------- + +All OpenVPN GUI reg-values are located below the following key: +HKEY_LOCAL_MACHINE\SOFTWARE\OpenVPN-GUI\ + +The follow keys are used to control the OpenVPN GUI + +config_dir + configuration file directory, defaults to "C:\Program Files\OpenVPN\config" + +config_ext + file extension on configuration files, defaults to "ovpn" + +connectscript_timeout + Time in seconds to wait for the connect script to finish. If set to 0 + the exitcode of the script is not checked. + +disconnectscript_timeout + Time in seconds to wait for the disconnect script to finish. Must be a + value between 1-99. + +preconnectscript_timeout + Time in seconds to wait for the preconnect script to finish. Must be a + value between 1-99. + +exe_path + path to openvpn.exe, defaults to "C:\Program Files\OpenVPN\bin\openvpn.exe" + +log_dir + log file directory, defaults to "C:\Program Files\OpenVPN\log" + +log_append + if set to "0", the log file will be truncated every time you start a + connection. If set to "1", the log will be appended to the log file. + +priority + the windows priority class for each instantiated OpenVPN process, + can be one of: + + * "IDLE_PRIORITY_CLASS" + * "BELOW_NORMAL_PRIORITY_CLASS" + * "NORMAL_PRIORITY_CLASS" (default) + * "ABOVE_NORMAL_PRIORITY_CLASS" + * "HIGH_PRIORITY_CLASS" + +allow_edit + If set to "1", the Edit config menu will be showed. + +allow_password + If set to "1", the Change Password menu will be showed. + +allow_proxy + If set to "1", the Proxy Settings menu will be showed. + +allow_service + If set to "1", the Service control menu will be showed. + +silent_connection + If set to "1", the status window with the OpenVPN log output will + not be showed while connecting. + +service_only + If set to "1", OpenVPN GUI's normal "Connect" and "Disconnect" + actions are changed so they start/stop the OpenVPN service instead + of launching openvpn.exe directly. + +show_balloon + If set to "0" - Never show any connected balloon. + "1" - Show balloon after initial connection is established. + "2" - Show balloon even after re-connects. +log_viewer + The program used to view your log files, defaults to + "C:\windows\notepad.exe" + +editor + The program used to edit your config files, defaults to + "C:\windows\notepad.exe" + +passphrase_attempts + Number of attempts to enter the passphrase to allow. + +All these registry options is also available as cmd-line options. +Use "openvpn-gui --help" for more info about cmd-line options. + + +If you have any problem getting OpenVPN GUI to work you can reach me via +email at ma...@ni.... + + +Building OpenVPN GUI from source +-------------------------------- + +* Download and install MinGW and MSYS from http://www.mingw.org/ + I'm using MinGW-3.2.0-rc-3 and MSYS-1.0.10. + +* Download and install the binary distribution of OpenSSL from + http://www.slproweb.com/products/Win32OpenSSL.html + +* Download and extract the OpenVPN GUI source archive. + +* Start a bash shell by running msys.bat. + +* Run "make" from the OpenVPN GUI source directory. -- 1.7.3.4