diff options
author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2007-10-22 20:06:14 +0000 |
---|---|---|
committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2007-10-22 20:06:14 +0000 |
commit | 718526e0e9efbcf6f8aa5cfa411c06c21429011d (patch) | |
tree | 91ba9366ad8d733256e15eb61623384a48a9950f /install-win32 | |
parent | 7256e6b4d6439695fc1221b00ae0b876006ffe75 (diff) | |
download | openvpn-718526e0e9efbcf6f8aa5cfa411c06c21429011d.tar.gz openvpn-718526e0e9efbcf6f8aa5cfa411c06c21429011d.tar.xz openvpn-718526e0e9efbcf6f8aa5cfa411c06c21429011d.zip |
Use pkcs11-helper as external library, can be downloaded
from https://www.opensc-project.org/pkcs11-helper (Alon Bar-Lev).
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2418 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'install-win32')
-rwxr-xr-x | install-win32/openvpn.nsi | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi index 5cbef9b..64d6f3a 100755 --- a/install-win32/openvpn.nsi +++ b/install-win32/openvpn.nsi @@ -110,6 +110,8 @@ LangString DESC_SecOpenSSLDLLs ${LANG_ENGLISH} "Install OpenSSL DLLs locally (may be omitted if DLLs are already installed globally)." + LangString DESC_SecPKCS11LDLLs ${LANG_ENGLISH} "Install PKCS#11 helper DLLs locally (may be omitted if DLLs are already installed globally)." + LangString DESC_SecTAP ${LANG_ENGLISH} "Install/Upgrade the TAP-Win32 virtual device driver. Will not interfere with CIPE." LangString DESC_SecService ${LANG_ENGLISH} "Install the ${PRODUCT_NAME} service wrapper (${PRODUCT_UNIX_NAME}serv.exe)" @@ -318,6 +320,14 @@ Section "OpenSSL Utilities" SecOpenSSLUtilities SectionEnd +Section "PKCS#11 DLLs" SecPKCS11DLLs + + SetOverwrite on + SetOutPath "$INSTDIR\bin" + File "${BIN}\libpkcs11-helper-1.dll" + +SectionEnd + Section "TAP-Win32 Virtual Ethernet Adapter" SecTAP SetOverwrite on @@ -566,6 +576,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecTAP} $(DESC_SecTAP) !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenSSLUtilities} $(DESC_SecOpenSSLUtilities) !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenSSLDLLs} $(DESC_SecOpenSSLDLLs) + !insertmacro MUI_DESCRIPTION_TEXT ${SecPKCS11DLLs} $(DESC_SecPKCS11DLLs) !insertmacro MUI_DESCRIPTION_TEXT ${SecAddPath} $(DESC_SecAddPath) !insertmacro MUI_DESCRIPTION_TEXT ${SecAddShortcuts} $(DESC_SecAddShortcuts) !insertmacro MUI_DESCRIPTION_TEXT ${SecService} $(DESC_SecService) @@ -615,6 +626,7 @@ Section "Uninstall" Delete "$INSTDIR\bin\${PRODUCT_UNIX_NAME}serv.exe" Delete "$INSTDIR\bin\libeay32.dll" Delete "$INSTDIR\bin\libssl32.dll" + Delete "$INSTDIR\bin\libpkcs11-helper-1.dll" Delete "$INSTDIR\bin\tapinstall.exe" Delete "$INSTDIR\bin\addtap.bat" Delete "$INSTDIR\bin\deltapall.bat" |