diff --git a/deploy/data/windows/x32/cloak/ck-client.exe b/deploy/data/windows/x32/cloak/ck-client.exe new file mode 100644 index 000000000..97e57c4b5 Binary files /dev/null and b/deploy/data/windows/x32/cloak/ck-client.exe differ diff --git a/deploy/data/windows/x32/cygwin/ash.exe b/deploy/data/windows/x32/cygwin/ash.exe new file mode 100644 index 000000000..f2160813d Binary files /dev/null and b/deploy/data/windows/x32/cygwin/ash.exe differ diff --git a/deploy/data/windows/x32/cygwin/cat.exe b/deploy/data/windows/x32/cygwin/cat.exe new file mode 100644 index 000000000..c6cd591cb Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cat.exe differ diff --git a/deploy/data/windows/x32/cygwin/cp.exe b/deploy/data/windows/x32/cygwin/cp.exe new file mode 100644 index 000000000..c009688b2 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cp.exe differ diff --git a/deploy/data/windows/x32/cygwin/cygargp-0.dll b/deploy/data/windows/x32/cygwin/cygargp-0.dll new file mode 100644 index 000000000..6f6a7d3a0 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygargp-0.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygattr-1.dll b/deploy/data/windows/x32/cygwin/cygattr-1.dll new file mode 100644 index 000000000..88bc79673 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygattr-1.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygcrypt-2.dll b/deploy/data/windows/x32/cygwin/cygcrypt-2.dll new file mode 100644 index 000000000..baede6fa3 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygcrypt-2.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygcrypto-1.1.dll b/deploy/data/windows/x32/cygwin/cygcrypto-1.1.dll new file mode 100644 index 000000000..8d5a239c1 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygcrypto-1.1.dll differ diff --git a/deploy/data/windows/x32/cygwin/cyggcc_s-1.dll b/deploy/data/windows/x32/cygwin/cyggcc_s-1.dll new file mode 100644 index 000000000..713f021a0 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cyggcc_s-1.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygiconv-2.dll b/deploy/data/windows/x32/cygwin/cygiconv-2.dll new file mode 100644 index 000000000..2abf63c3c Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygiconv-2.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygintl-8.dll b/deploy/data/windows/x32/cygwin/cygintl-8.dll new file mode 100644 index 000000000..75e492556 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygintl-8.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygk5crypto-3.dll b/deploy/data/windows/x32/cygwin/cygk5crypto-3.dll new file mode 100644 index 000000000..d07e7d53b Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygk5crypto-3.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygpcre-1.dll b/deploy/data/windows/x32/cygwin/cygpcre-1.dll new file mode 100644 index 000000000..9f2f55800 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygpcre-1.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygpipeline-1.dll b/deploy/data/windows/x32/cygwin/cygpipeline-1.dll new file mode 100644 index 000000000..c9bac931e Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygpipeline-1.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygpopt-0.dll b/deploy/data/windows/x32/cygwin/cygpopt-0.dll new file mode 100644 index 000000000..158f597d9 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygpopt-0.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygreadline7.dll b/deploy/data/windows/x32/cygwin/cygreadline7.dll new file mode 100644 index 000000000..612a987ae Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygreadline7.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygsigsegv-2.dll b/deploy/data/windows/x32/cygwin/cygsigsegv-2.dll new file mode 100644 index 000000000..0552b0211 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygsigsegv-2.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygssl-1.1.dll b/deploy/data/windows/x32/cygwin/cygssl-1.1.dll new file mode 100644 index 000000000..63c8fb89e Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygssl-1.1.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygstdc++-6.dll b/deploy/data/windows/x32/cygwin/cygstdc++-6.dll new file mode 100644 index 000000000..6e264beed Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygstdc++-6.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygwin1.dll b/deploy/data/windows/x32/cygwin/cygwin1.dll new file mode 100644 index 000000000..aa45052d8 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygwin1.dll differ diff --git a/deploy/data/windows/x32/cygwin/cygz.dll b/deploy/data/windows/x32/cygwin/cygz.dll new file mode 100644 index 000000000..c667216f2 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/cygz.dll differ diff --git a/deploy/data/windows/x32/cygwin/date.exe b/deploy/data/windows/x32/cygwin/date.exe new file mode 100644 index 000000000..b219bb7ab Binary files /dev/null and b/deploy/data/windows/x32/cygwin/date.exe differ diff --git a/deploy/data/windows/x32/cygwin/diff.exe b/deploy/data/windows/x32/cygwin/diff.exe new file mode 100644 index 000000000..498c8076b Binary files /dev/null and b/deploy/data/windows/x32/cygwin/diff.exe differ diff --git a/deploy/data/windows/x32/cygwin/diff3.exe b/deploy/data/windows/x32/cygwin/diff3.exe new file mode 100644 index 000000000..3c2b622be Binary files /dev/null and b/deploy/data/windows/x32/cygwin/diff3.exe differ diff --git a/deploy/data/windows/x32/cygwin/dir.exe b/deploy/data/windows/x32/cygwin/dir.exe new file mode 100644 index 000000000..148f3dadc Binary files /dev/null and b/deploy/data/windows/x32/cygwin/dir.exe differ diff --git a/deploy/data/windows/x32/cygwin/grep.exe b/deploy/data/windows/x32/cygwin/grep.exe new file mode 100644 index 000000000..e4ae3462a Binary files /dev/null and b/deploy/data/windows/x32/cygwin/grep.exe differ diff --git a/deploy/data/windows/x32/cygwin/ls.exe b/deploy/data/windows/x32/cygwin/ls.exe new file mode 100644 index 000000000..b830b48bc Binary files /dev/null and b/deploy/data/windows/x32/cygwin/ls.exe differ diff --git a/deploy/data/windows/x32/cygwin/md5sum.exe b/deploy/data/windows/x32/cygwin/md5sum.exe new file mode 100644 index 000000000..c6fcc87eb Binary files /dev/null and b/deploy/data/windows/x32/cygwin/md5sum.exe differ diff --git a/deploy/data/windows/x32/cygwin/mkdir.exe b/deploy/data/windows/x32/cygwin/mkdir.exe new file mode 100644 index 000000000..230f36397 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/mkdir.exe differ diff --git a/deploy/data/windows/x32/cygwin/mktemp.exe b/deploy/data/windows/x32/cygwin/mktemp.exe new file mode 100644 index 000000000..ba59bdd8b Binary files /dev/null and b/deploy/data/windows/x32/cygwin/mktemp.exe differ diff --git a/deploy/data/windows/x32/cygwin/mv.exe b/deploy/data/windows/x32/cygwin/mv.exe new file mode 100644 index 000000000..7632efcef Binary files /dev/null and b/deploy/data/windows/x32/cygwin/mv.exe differ diff --git a/deploy/data/windows/x32/cygwin/openssl.exe b/deploy/data/windows/x32/cygwin/openssl.exe new file mode 100644 index 000000000..dec7d6844 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/openssl.exe differ diff --git a/deploy/data/windows/x32/cygwin/printf.exe b/deploy/data/windows/x32/cygwin/printf.exe new file mode 100644 index 000000000..25d72dd06 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/printf.exe differ diff --git a/deploy/data/windows/x32/cygwin/pwd.exe b/deploy/data/windows/x32/cygwin/pwd.exe new file mode 100644 index 000000000..c5461a652 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/pwd.exe differ diff --git a/deploy/data/windows/x32/cygwin/readlink.exe b/deploy/data/windows/x32/cygwin/readlink.exe new file mode 100644 index 000000000..651f4fe1a Binary files /dev/null and b/deploy/data/windows/x32/cygwin/readlink.exe differ diff --git a/deploy/data/windows/x32/cygwin/rm.exe b/deploy/data/windows/x32/cygwin/rm.exe new file mode 100644 index 000000000..17bb42529 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/rm.exe differ diff --git a/deploy/data/windows/x32/cygwin/sed.exe b/deploy/data/windows/x32/cygwin/sed.exe new file mode 100644 index 000000000..3313d201b Binary files /dev/null and b/deploy/data/windows/x32/cygwin/sed.exe differ diff --git a/deploy/data/windows/x32/cygwin/ssh-keygen.exe b/deploy/data/windows/x32/cygwin/ssh-keygen.exe new file mode 100644 index 000000000..f1fe5116b Binary files /dev/null and b/deploy/data/windows/x32/cygwin/ssh-keygen.exe differ diff --git a/deploy/data/windows/x32/cygwin/which.exe b/deploy/data/windows/x32/cygwin/which.exe new file mode 100644 index 000000000..8694d1849 Binary files /dev/null and b/deploy/data/windows/x32/cygwin/which.exe differ diff --git a/deploy/data/windows/x32/tap/i386/OemVista.inf b/deploy/data/windows/x32/tap/windows_10/OemVista.inf similarity index 100% rename from deploy/data/windows/x32/tap/i386/OemVista.inf rename to deploy/data/windows/x32/tap/windows_10/OemVista.inf diff --git a/deploy/data/windows/x32/tap/i386/tap0901.cat b/deploy/data/windows/x32/tap/windows_10/tap0901.cat similarity index 100% rename from deploy/data/windows/x32/tap/i386/tap0901.cat rename to deploy/data/windows/x32/tap/windows_10/tap0901.cat diff --git a/deploy/data/windows/x32/tap/i386/tap0901.sys b/deploy/data/windows/x32/tap/windows_10/tap0901.sys similarity index 99% rename from deploy/data/windows/x32/tap/i386/tap0901.sys rename to deploy/data/windows/x32/tap/windows_10/tap0901.sys index 702899621..4659aa257 100644 Binary files a/deploy/data/windows/x32/tap/i386/tap0901.sys and b/deploy/data/windows/x32/tap/windows_10/tap0901.sys differ diff --git a/deploy/data/windows/x32/tap/i386/tapinstall.exe b/deploy/data/windows/x32/tap/windows_10/tapinstall.exe similarity index 99% rename from deploy/data/windows/x32/tap/i386/tapinstall.exe rename to deploy/data/windows/x32/tap/windows_10/tapinstall.exe index 6ffd2eb4d..fe91417de 100644 Binary files a/deploy/data/windows/x32/tap/i386/tapinstall.exe and b/deploy/data/windows/x32/tap/windows_10/tapinstall.exe differ diff --git a/deploy/data/windows/x32/tap/x86_64_windows_7/OemVista.inf b/deploy/data/windows/x32/tap/windows_7/OemVista.inf similarity index 99% rename from deploy/data/windows/x32/tap/x86_64_windows_7/OemVista.inf rename to deploy/data/windows/x32/tap/windows_7/OemVista.inf index d92e2558b..6cd679131 100644 --- a/deploy/data/windows/x32/tap/x86_64_windows_7/OemVista.inf +++ b/deploy/data/windows/x32/tap/windows_7/OemVista.inf @@ -65,9 +65,9 @@ ; Manufacturer + Product Section (Done) ;---------------------------------------------------------------- [Manufacturer] - %Provider% = tap0901, NTamd64 + %Provider% = tap0901 -[tap0901.NTamd64] +[tap0901] %DeviceDescription% = tap0901.ndi, root\tap0901 ; Root enumerated %DeviceDescription% = tap0901.ndi, tap0901 ; Legacy diff --git a/deploy/data/windows/x32/tap/x86_64_windows_7/OpenVPN.cer b/deploy/data/windows/x32/tap/windows_7/OpenVPN.cer similarity index 100% rename from deploy/data/windows/x32/tap/x86_64_windows_7/OpenVPN.cer rename to deploy/data/windows/x32/tap/windows_7/OpenVPN.cer diff --git a/deploy/data/windows/x32/tap/x86_64_windows_7/tap0901.cat b/deploy/data/windows/x32/tap/windows_7/tap0901.cat similarity index 88% rename from deploy/data/windows/x32/tap/x86_64_windows_7/tap0901.cat rename to deploy/data/windows/x32/tap/windows_7/tap0901.cat index 70ddd2c26..d8453103d 100644 Binary files a/deploy/data/windows/x32/tap/x86_64_windows_7/tap0901.cat and b/deploy/data/windows/x32/tap/windows_7/tap0901.cat differ diff --git a/deploy/data/windows/x32/tap/windows_7/tap0901.sys b/deploy/data/windows/x32/tap/windows_7/tap0901.sys new file mode 100644 index 000000000..4bc59b55d Binary files /dev/null and b/deploy/data/windows/x32/tap/windows_7/tap0901.sys differ diff --git a/deploy/data/windows/x32/tap/x86_64_windows_7/tapinstall.exe b/deploy/data/windows/x32/tap/windows_7/tapinstall.exe similarity index 56% rename from deploy/data/windows/x32/tap/x86_64_windows_7/tapinstall.exe rename to deploy/data/windows/x32/tap/windows_7/tapinstall.exe index 7f5f95a61..327aafca3 100644 Binary files a/deploy/data/windows/x32/tap/x86_64_windows_7/tapinstall.exe and b/deploy/data/windows/x32/tap/windows_7/tapinstall.exe differ diff --git a/deploy/data/windows/x32/tap/x86_64/OemVista.inf b/deploy/data/windows/x32/tap/x86_64/OemVista.inf deleted file mode 100644 index a765fc140..000000000 --- a/deploy/data/windows/x32/tap/x86_64/OemVista.inf +++ /dev/null @@ -1,191 +0,0 @@ -; **************************************************************************** -; * Copyright (C) 2002-2014 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\oemvista.inf -; OUTPUT -> file:///c:/WINDDK/3790/tools/chkinf/htm/c%23+src+openvpn+tap-win32+i386+__OemWin2k.htm - -; INSTALL/REMOVE DRIVER -; tapinstall install OemVista.inf tapoas -; tapinstall update OemVista.inf tapoas -; tapinstall remove tapoas - -;********************************************************* -; 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 = tap0901.cat - ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} - Provider = %Provider% - Class = Net - -; This version number should match the version -; number given in ..\version.m4. - DriverVer = 09/27/2019,9.24.2.601 - -[Strings] - DeviceDescription = "TAP-Windows Adapter V9" - Provider = "TAP-Windows Provider V9" - -;---------------------------------------------------------------- -; Manufacturer + Product Section (Done) -;---------------------------------------------------------------- -[Manufacturer] - %Provider% = tap0901, NTamd64 - -[tap0901.NTamd64] - %DeviceDescription% = tap0901.ndi, root\tap0901 ; Root enumerated - %DeviceDescription% = tap0901.ndi, tap0901 ; Legacy - -;--------------------------------------------------------------- -; 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 ------------ - -[tap0901.ndi] - CopyFiles = tap0901.driver, tap0901.files - AddReg = tap0901.reg - AddReg = tap0901.params.reg - Characteristics = 0x1 - *IfType = 53 ; IF_TYPE_PROP_VIRTUAL - *MediaType = 0x0 ; NdisMedium802_3 - *PhysicalMediaType = 0 ; NdisPhysicalMediumUnspecified - -[tap0901.ndi.Services] - AddService = tap0901, 2, tap0901.service - -[tap0901.reg] - HKR, Ndi, Service, 0, "tap0901" - HKR, Ndi\Interfaces, UpperRange, 0, "ndis5" - HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" - HKR, , Manufacturer, 0, "%Provider%" - HKR, , ProductName, 0, "%DeviceDescription%" - -[tap0901.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 --------------- - -[tap0901.service] - DisplayName = %DeviceDescription% - ServiceType = 1 - StartType = 3 - ErrorControl = 1 - LoadOrderGroup = NDIS - ServiceBinary = %12%\tap0901.sys - -;----------------------------------------------------------------- -; File Installation -;----------------------------------------------------------------- - -;----------------- Copy Flags ------------ -; COPYFLG_NOSKIP = 0x02 -; COPYFLG_NOVERSIONCHECK = 0x04 -;----------------- Copy Flags ------------ - -; SourceDisksNames -; diskid = description[, [tagfile] [, , subdir]] -; 1 = "Intel Driver Disk 1",e100bex.sys,, - -[SourceDisksNames] - 1 = %DeviceDescription%, tap0901.sys - -; SourceDisksFiles -; filename_on_source = diskID[, [subdir][, size]] -; e100bex.sys = 1,, ; on distribution disk 1 - -[SourceDisksFiles] -tap0901.sys = 1 - -[DestinationDirs] - tap0901.files = 11 - tap0901.driver = 12 - -[tap0901.files] -; TapPanel.cpl,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK -; cipsrvr.exe,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK - -[tap0901.driver] - tap0901.sys,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK - -;--------------------------------------------------------------- -; End -;--------------------------------------------------------------- diff --git a/deploy/data/windows/x32/tap/x86_64/tap0901.cat b/deploy/data/windows/x32/tap/x86_64/tap0901.cat deleted file mode 100644 index 22b0096cf..000000000 Binary files a/deploy/data/windows/x32/tap/x86_64/tap0901.cat and /dev/null differ diff --git a/deploy/data/windows/x32/tap/x86_64/tap0901.sys b/deploy/data/windows/x32/tap/x86_64/tap0901.sys deleted file mode 100644 index 55fcac21e..000000000 Binary files a/deploy/data/windows/x32/tap/x86_64/tap0901.sys and /dev/null differ diff --git a/deploy/data/windows/x32/tap/x86_64/tapinstall.exe b/deploy/data/windows/x32/tap/x86_64/tapinstall.exe deleted file mode 100644 index 6e26987f7..000000000 Binary files a/deploy/data/windows/x32/tap/x86_64/tapinstall.exe and /dev/null differ diff --git a/deploy/data/windows/x32/tap/x86_64_windows_7/tap0901.sys b/deploy/data/windows/x32/tap/x86_64_windows_7/tap0901.sys deleted file mode 100644 index c6628201c..000000000 Binary files a/deploy/data/windows/x32/tap/x86_64_windows_7/tap0901.sys and /dev/null differ