Merge pull request #565 from frankmorgner/sm-openssl
Build a lightweight version of OpenSC
This commit is contained in:
commit
f851197129
45
appveyor.yml
45
appveyor.yml
|
@ -1,18 +1,31 @@
|
|||
version: 0.15.0.{build}
|
||||
|
||||
platform:
|
||||
# the prebuilt zlib is 32 bit only
|
||||
- x86
|
||||
- x64
|
||||
|
||||
configuration:
|
||||
- Release
|
||||
- Debug
|
||||
- Light-Release
|
||||
- Light-Debug
|
||||
|
||||
environment:
|
||||
matrix:
|
||||
- VSVER: 12
|
||||
- VSVER: 10
|
||||
|
||||
matrix:
|
||||
allow_failures:
|
||||
# the prebuilt zlib is 32 bit only
|
||||
- platform: x64
|
||||
configuration: Debug
|
||||
- platform: x64
|
||||
configuration: Release
|
||||
# not included in AppVeyor right now
|
||||
- platform: x64
|
||||
VSVER: 10
|
||||
|
||||
install:
|
||||
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
|
||||
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
|
||||
|
@ -37,22 +50,24 @@ install:
|
|||
$env:ARTIFACT="OpenSC-${env:APPVEYOR_BUILD_VERSION}-win64_vs${env:VSVER}-${env:CONFIGURATION}.msi"
|
||||
}
|
||||
- ps: >-
|
||||
If ($env:Configuration -Match "Debug") {
|
||||
$env:NMAKE_DEBUG="DEBUG_DEF=/DDEBUG"
|
||||
If ($env:Configuration -Like "*Debug*") {
|
||||
$env:NMAKE_EXTRA="DEBUG_DEF=/DDEBUG ${env:NMAKE_EXTRA}"
|
||||
}
|
||||
- ps: >-
|
||||
If (!($env:Configuration -Like "*Light*")) {
|
||||
If (!(Test-Path -Path "C:\OpenSSL-${env:OPENSSL_PF}" )) {
|
||||
Start-FileDownload https://slproweb.com/download/${env:OPENSSL_PF}OpenSSL-${env:OPENSSL_VER}.exe -FileName C:\WinOpenSSL.exe
|
||||
C:\WinOpenSSL.exe /SILENT /VERYSILENT /SP- /SUPPRESSMSGBOXES /NORESTART
|
||||
}
|
||||
If (!(Test-Path -Path "C:\zlib-dll" )) {
|
||||
appveyor DownloadFile "https://prdownloads.sourceforge.net/libpng/zlib${env:ZLIB_VER}-dll.zip" -FileName zlib-dll.zip
|
||||
7z x zlib-dll.zip -oC:\zlib-dll
|
||||
}
|
||||
$env:NMAKE_EXTRA="OPENSSL_DEF=/DENABLE_OPENSSL ZLIB_DEF=/DENABLE_ZLIB ${env:NMAKE_EXTRA}"
|
||||
}
|
||||
- ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))
|
||||
- echo "Using Visual Studio %VSVER%.0 at %VSCOMNTOOLS%"
|
||||
- call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
|
||||
- ps: >-
|
||||
If(!(Test-Path -Path "C:\OpenSSL-${env:OPENSSL_PF}" )) {
|
||||
Start-FileDownload https://slproweb.com/download/${env:OPENSSL_PF}OpenSSL-${env:OPENSSL_VER}.exe -FileName C:\WinOpenSSL.exe
|
||||
C:\WinOpenSSL.exe /SILENT /VERYSILENT /SP- /SUPPRESSMSGBOXES /NORESTART
|
||||
}
|
||||
- ps: >-
|
||||
If(!(Test-Path -Path "C:\zlib-dll" )) {
|
||||
appveyor DownloadFile "https://prdownloads.sourceforge.net/libpng/zlib${env:ZLIB_VER}-dll.zip" -FileName zlib-dll.zip
|
||||
7z x zlib-dll.zip -oC:\zlib-dll
|
||||
}
|
||||
- appveyor DownloadFile "http://download.microsoft.com/download/2/C/9/2C93059C-0532-42DF-8C24-9AEAFF00768E/cngsdk.msi"
|
||||
- cngsdk.msi /quiet
|
||||
- uname -a
|
||||
|
@ -62,8 +77,8 @@ build_script:
|
|||
# disable features to speed up the script
|
||||
- bash -c "exec 0</dev/null && ./configure --disable-openssl --disable-readline --disable-zlib || cat config.log"
|
||||
- cp win32/winconfig.h config.h
|
||||
- nmake /f Makefile.mak %NMAKE_ARCH% %NMAKE_DEBUG%
|
||||
- cd win32 && nmake /f Makefile.mak %NMAKE_ARCH% %NMAKE_DEBUG% VSVER=%VSVER% OpenSC.msi
|
||||
- nmake /f Makefile.mak %NMAKE_ARCH% %NMAKE_EXTRA%
|
||||
- cd win32 && nmake /f Makefile.mak %NMAKE_ARCH% %NMAKE_EXTRA% VSVER=%VSVER% OpenSC.msi
|
||||
- move OpenSC.msi %ARTIFACT%
|
||||
- appveyor PushArtifact %ARTIFACT%
|
||||
|
||||
|
|
|
@ -486,14 +486,12 @@ PKG_CHECK_MODULES(
|
|||
case "${enable_openssl}" in
|
||||
no)
|
||||
have_openssl="no"
|
||||
enable_sm="no"
|
||||
;;
|
||||
detect)
|
||||
if test "${have_openssl}" = "yes"; then
|
||||
enable_openssl="yes"
|
||||
else
|
||||
enable_openssl="no"
|
||||
enable_sm="no"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
@ -504,6 +502,9 @@ if test "${enable_openssl}" = "yes"; then
|
|||
else
|
||||
AC_MSG_ERROR([OpenSSL linkage required, but no OpenSSL was found])
|
||||
fi
|
||||
else
|
||||
OPENSSL_CFLAGS=""
|
||||
OPENSSL_LIBS=""
|
||||
fi
|
||||
|
||||
if test "${enable_sm}" = "yes"; then
|
||||
|
|
|
@ -8,4 +8,3 @@ SUBDIRS = common scconf pkcs15init libopensc pkcs11 \
|
|||
if ENABLE_SM
|
||||
SUBDIRS += libsm smm
|
||||
endif
|
||||
|
||||
|
|
|
@ -47,4 +47,4 @@ opensc.dll: $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\common\libsc
|
|||
if EXIST opensc.dll.manifest mt -manifest opensc.dll.manifest -outputresource:opensc.dll;2
|
||||
|
||||
opensc_a.lib: $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\common\libscdl.lib ..\pkcs15init\pkcs15init.lib
|
||||
lib $(LIBFLAGS) /out:opensc_a.lib $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\common\libscdl.lib ..\pkcs15init\pkcs15init.lib $(ZLIB_LIB) user32.lib ws2_32.lib
|
||||
lib $(LIBFLAGS) /out:opensc_a.lib $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\common\libscdl.lib ..\pkcs15init\pkcs15init.lib $(ZLIB_LIB) user32.lib advapi32.lib ws2_32.lib
|
||||
|
|
|
@ -3571,4 +3571,15 @@ sc_get_iasecc_driver(void)
|
|||
return sc_get_driver();
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
/* we need to define the functions below to export them */
|
||||
#include "errors.h"
|
||||
|
||||
int
|
||||
iasecc_se_get_info()
|
||||
{
|
||||
return SC_ERROR_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
#endif /* ENABLE_OPENSSL */
|
||||
|
|
|
@ -1299,4 +1299,10 @@ iasecc_sdo_encode_update_field()
|
|||
return SC_ERROR_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
int
|
||||
iasecc_se_get_crt()
|
||||
{
|
||||
return SC_ERROR_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
#endif /* ENABLE_OPENSSL */
|
||||
|
|
|
@ -3,7 +3,9 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
EXTRA_DIST = Makefile.mak
|
||||
|
||||
if ENABLE_OPENSSL
|
||||
noinst_LTLIBRARIES = libsm.la
|
||||
endif
|
||||
noinst_HEADERS = sm-common.h
|
||||
|
||||
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
TOPDIR = ..\..
|
||||
|
||||
!IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL"
|
||||
TARGET = libsm.lib
|
||||
OBJECTS = sm-common.obj
|
||||
|
||||
|
@ -9,3 +10,7 @@ $(TARGET): $(OBJECTS)
|
|||
lib $(LIBFLAGS) /out:$(TARGET) $(OBJECTS)
|
||||
|
||||
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
|
||||
|
||||
!ELSE
|
||||
all:
|
||||
!ENDIF
|
||||
|
|
|
@ -10,7 +10,9 @@ LIBS = $(top_builddir)/src/libsm/libsm.la \
|
|||
$(top_builddir)/src/libopensc/libopensc.la \
|
||||
$(top_builddir)/src/common/libcompat.la
|
||||
|
||||
if ENABLE_OPENSSL
|
||||
lib_LTLIBRARIES = libsmm-local.la
|
||||
endif
|
||||
|
||||
libsmm_local_la_SOURCES = smm-local.c sm-module.h \
|
||||
sm-global-platform.c sm-cwa14890.c \
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
TOPDIR = ..\..
|
||||
|
||||
!IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL"
|
||||
TARGET = smm-local.dll
|
||||
|
||||
OBJECTS = smm-local.obj sm-global-platform.obj sm-cwa14890.obj sm-card-iasecc.obj sm-card-authentic.obj
|
||||
|
@ -17,3 +18,7 @@ $(TARGET): $(OBJECTS) ..\libsm\libsm.lib ..\libopensc\opensc.lib
|
|||
|
||||
.c.obj:
|
||||
cl $(COPTS) /c $<
|
||||
|
||||
!ELSE
|
||||
all:
|
||||
!ENDIF
|
||||
|
|
|
@ -3,8 +3,7 @@ TOPDIR = ..\..
|
|||
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
|
||||
|
||||
TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe pkcs15-crypt.exe \
|
||||
pkcs11-tool.exe cardos-tool.exe eidenv.exe sc-hsm-tool.exe openpgp-tool.exe dnie-tool.exe \
|
||||
iasecc-tool.exe cryptoflex-tool.exe netkey-tool.exe piv-tool.exe westcos-tool.exe \
|
||||
pkcs11-tool.exe cardos-tool.exe eidenv.exe openpgp-tool.exe iasecc-tool.exe \
|
||||
$(PROGRAMS_OPENSSL)
|
||||
|
||||
$(TARGETS): versioninfo-tools.res util.obj
|
||||
|
|
|
@ -23,7 +23,7 @@ SM_DEF = /DENABLE_SM
|
|||
# - uncomment the line starting with OPENSSL_DEF
|
||||
# - set the OPENSSL_INCL_DIR below to your openssl include directory, preceded by "/I"
|
||||
# - set the OPENSSL_LIB below to your openssl lib file
|
||||
OPENSSL_DEF = /DENABLE_OPENSSL
|
||||
#OPENSSL_DEF= /DENABLE_OPENSSL
|
||||
!IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL"
|
||||
!IF "$(BUILD_FOR)" == "WIN64"
|
||||
OPENSSL_DIR = C:\OpenSSL-Win64
|
||||
|
@ -45,8 +45,10 @@ OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\$(OPENSSL_STATIC_DIR)\libeay32MTd.lib user32
|
|||
OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\$(OPENSSL_STATIC_DIR)\libeay32MT.lib user32.lib advapi32.lib crypt32.lib
|
||||
!ENDIF
|
||||
|
||||
PROGRAMS_OPENSSL = pkcs15-init.exe cryptoflex-tool.exe netkey-tool.exe piv-tool.exe westcos-tool.exe
|
||||
PROGRAMS_OPENSSL = cryptoflex-tool.exe pkcs15-init.exe netkey-tool.exe piv-tool.exe \
|
||||
westcos-tool.exe sc-hsm-tool.exe dnie-tool.exe
|
||||
OPENSC_FEATURES = $(OPENSC_FEATURES) openssl
|
||||
CANDLEFLAGS = -dOpenSSL="$(OPENSSL_DIR)" $(CANDLEFLAGS)
|
||||
!ENDIF
|
||||
|
||||
|
||||
|
@ -55,11 +57,12 @@ OPENSC_FEATURES = $(OPENSC_FEATURES) openssl
|
|||
# - uncomment the line starting with ZLIB_DEF
|
||||
# - set the ZLIB_INCL_DIR below to the zlib include lib proceeded by "/I"
|
||||
# - set the ZLIB_LIB below to your zlib lib file
|
||||
ZLIB_DEF = /DENABLE_ZLIB
|
||||
#ZLIB_DEF = /DENABLE_ZLIB
|
||||
!IF "$(ZLIB_DEF)" == "/DENABLE_ZLIB"
|
||||
ZLIB_INCL_DIR = /IC:\zlib-dll\include
|
||||
ZLIB_LIB = C:\zlib-dll\lib\zdll.lib
|
||||
OPENSC_FEATURES = $(OPENSC_FEATURES) zlib
|
||||
CANDLEFLAGS = -dzlib="C:\zlib-dll" $(CANDLEFLAGS)
|
||||
!ENDIF
|
||||
|
||||
# Used for MiniDriver
|
||||
|
@ -87,11 +90,11 @@ COPTS = /W3 /D_CRT_SECURE_NO_DEPRECATE /MT /nologo /DHAVE_CONFIG_H $(ALL_INCLUD
|
|||
!IF "$(BUILD_FOR)" == "WIN64"
|
||||
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X64 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT $(LINKDEBUGFLAGS)
|
||||
LIBFLAGS = /nologo /machine:x64
|
||||
CANDLEFLAGS = -dPlatform=x64
|
||||
CANDLEFLAGS = -dPlatform=x64 $(CANDLEFLAGS)
|
||||
!ELSE
|
||||
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT $(LINKDEBUGFLAGS)
|
||||
LIBFLAGS = /nologo /machine:x86
|
||||
CANDLEFLAGS = -dPlatform=x86
|
||||
CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAGS)
|
||||
!ENDIF
|
||||
.c.obj::
|
||||
cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
|
||||
|
|
|
@ -11,7 +11,7 @@ customactions.dll: versioninfo-customactions.res customactions.obj
|
|||
echo LIBRARY $* > $*.def
|
||||
echo EXPORTS >> $*.def
|
||||
type customactions.exports >> $*.def
|
||||
link /dll $(LINKFLAGS) /def:$*.def /out:customactions.dll versioninfo-customactions.res customactions.obj msi.lib $(WIX_LIBS) Advapi32.lib User32.lib Version.lib Shell32.lib
|
||||
link /dll $(LINKFLAGS) /def:$*.def /out:customactions.dll versioninfo-customactions.res customactions.obj msi.lib $(WIX_LIBS) Advapi32.lib User32.lib Version.lib Shell32.lib
|
||||
|
||||
OpenSC.msi: OpenSC.wixobj
|
||||
"$(WIX_PATH)\bin\light.exe" -sh -ext WixUIExtension -ext WiXUtilExtension $?
|
||||
|
|
|
@ -1,12 +1,20 @@
|
|||
<?xml version="1.0" encoding="windows-1252"?>
|
||||
<?if $(var.Platform) = x64 ?>
|
||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ (64bit)" ?>
|
||||
<?ifndef OpenSSL ?>
|
||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ Light (64bit)" ?>
|
||||
<?else ?>
|
||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ (64bit)" ?>
|
||||
<?endif ?>
|
||||
<?define Win64YesNo="yes" ?>
|
||||
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
|
||||
<?define PlatformSystemFolder = "System64Folder" ?>
|
||||
<?define PlatformUpgradeCode = "{9A449570-69A2-11E0-9CC6-955B4824019B}" ?>
|
||||
<?else ?>
|
||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@" ?>
|
||||
<?ifndef OpenSSL ?>
|
||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ Light" ?>
|
||||
<?else ?>
|
||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@" ?>
|
||||
<?endif ?>
|
||||
<?define Win64YesNo="no" ?>
|
||||
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
|
||||
<?define PlatformSystemFolder = "SystemFolder" ?>
|
||||
|
@ -108,12 +116,14 @@
|
|||
|
||||
<!-- Tools have their own folder -->
|
||||
<Directory Id="INSTALLDIR_TOOLS" Name="tools">
|
||||
<?ifdef zlib ?>
|
||||
<Component Id="zlib1.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.zlib)\zlib1.dll" Vital="yes"/>
|
||||
</Component>
|
||||
<?endif ?>
|
||||
<Component Id="opensc.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\libopensc\opensc.dll" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="smm_local.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\smm\smm-local.dll" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="opensc_explorer.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\opensc-explorer.exe" Vital="yes"/>
|
||||
</Component>
|
||||
|
@ -129,132 +139,142 @@
|
|||
<Component Id="eidenv.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\eidenv.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="pkcs15_init.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\pkcs15-init.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="pkcs15_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\pkcs15-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="pkcs15_crypt.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\pkcs15-crypt.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="sc_hsm_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\sc-hsm-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="dnie_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\dnie-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="openpgp_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\openpgp-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="iasecc_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\iasecc-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="cryptoflex_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\cryptoflex-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="netkey_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\netkey-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="piv_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\piv-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="westcos_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\westcos-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="INSTALLDIR_PROFILES" Name="profiles">
|
||||
<Component Id="cyberflex.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\cyberflex.profile"/>
|
||||
</Component>
|
||||
<Component Id="flex.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\flex.profile"/>
|
||||
</Component>
|
||||
<Component Id="gpk.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\gpk.profile"/>
|
||||
</Component>
|
||||
<Component Id="miocos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\miocos.profile"/>
|
||||
</Component>
|
||||
<Component Id="incrypto34.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\incrypto34.profile"/>
|
||||
</Component>
|
||||
<Component Id="jcop.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\jcop.profile"/>
|
||||
</Component>
|
||||
<Component Id="muscle.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\muscle.profile"/>
|
||||
</Component>
|
||||
<Component Id="pkcs15.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\pkcs15.profile"/>
|
||||
</Component>
|
||||
<Component Id="asepcos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\asepcos.profile"/>
|
||||
</Component>
|
||||
<Component Id="cardos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\cardos.profile"/>
|
||||
</Component>
|
||||
<Component Id="entersafe.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\entersafe.profile"/>
|
||||
</Component>
|
||||
<Component Id="epass2003.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\epass2003.profile"/>
|
||||
</Component>
|
||||
<Component Id="myeid.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\myeid.profile"/>
|
||||
</Component>
|
||||
<Component Id="setcos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\setcos.profile"/>
|
||||
</Component>
|
||||
<Component Id="starcos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\starcos.profile"/>
|
||||
</Component>
|
||||
<Component Id="westcos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\westcos.profile"/>
|
||||
</Component>
|
||||
<Component Id="oberthur.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\oberthur.profile"/>
|
||||
</Component>
|
||||
<Component Id="authentic.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\authentic.profile"/>
|
||||
</Component>
|
||||
<Component Id="rutoken.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\rutoken.profile"/>
|
||||
</Component>
|
||||
<Component Id="rutoken_ecp.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\rutoken_ecp.profile"/>
|
||||
</Component>
|
||||
<Component Id="ias_adele_admin1.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\ias_adele_admin1.profile"/>
|
||||
</Component>
|
||||
<Component Id="ias_adele_admin2.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\ias_adele_admin2.profile"/>
|
||||
</Component>
|
||||
<Component Id="ias_adele_common.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\ias_adele_common.profile"/>
|
||||
</Component>
|
||||
<Component Id="iasecc_admin_eid.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\iasecc_admin_eid.profile"/>
|
||||
</Component>
|
||||
<Component Id="iasecc_generic_oberthur.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\iasecc_generic_oberthur.profile"/>
|
||||
</Component>
|
||||
<Component Id="iasecc_generic_pki.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\iasecc_generic_pki.profile"/>
|
||||
</Component>
|
||||
<Component Id="iasecc.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\iasecc.profile"/>
|
||||
</Component>
|
||||
<Component Id="schsm.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\sc-hsm.profile"/>
|
||||
</Component>
|
||||
<Component Id="openpgp.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\openpgp.profile"/>
|
||||
</Component>
|
||||
<Component Id="isoApplet.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\isoApplet.profile"/>
|
||||
</Component>
|
||||
<?ifdef OpenSSL ?>
|
||||
<Component Id="libeay32.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.OpenSSL)\libeay32.dll" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="smm_local.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\smm\smm-local.dll" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="cryptoflex_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\cryptoflex-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="pkcs15_init.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\pkcs15-init.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="netkey_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\netkey-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="piv_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\piv-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="westcos_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\westcos-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="sc_hsm_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\sc-hsm-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<Component Id="dnie_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\tools\dnie-tool.exe" Vital="yes"/>
|
||||
</Component>
|
||||
<?endif ?>
|
||||
</Directory>
|
||||
<?ifdef OpenSSL ?>
|
||||
<Directory Id="INSTALLDIR_PROFILES" Name="profiles">
|
||||
<Component Id="cyberflex.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\cyberflex.profile"/>
|
||||
</Component>
|
||||
<Component Id="flex.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\flex.profile"/>
|
||||
</Component>
|
||||
<Component Id="gpk.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\gpk.profile"/>
|
||||
</Component>
|
||||
<Component Id="miocos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\miocos.profile"/>
|
||||
</Component>
|
||||
<Component Id="incrypto34.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\incrypto34.profile"/>
|
||||
</Component>
|
||||
<Component Id="jcop.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\jcop.profile"/>
|
||||
</Component>
|
||||
<Component Id="muscle.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\muscle.profile"/>
|
||||
</Component>
|
||||
<Component Id="pkcs15.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\pkcs15.profile"/>
|
||||
</Component>
|
||||
<Component Id="asepcos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\asepcos.profile"/>
|
||||
</Component>
|
||||
<Component Id="cardos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\cardos.profile"/>
|
||||
</Component>
|
||||
<Component Id="entersafe.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\entersafe.profile"/>
|
||||
</Component>
|
||||
<Component Id="epass2003.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\epass2003.profile"/>
|
||||
</Component>
|
||||
<Component Id="myeid.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\myeid.profile"/>
|
||||
</Component>
|
||||
<Component Id="setcos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\setcos.profile"/>
|
||||
</Component>
|
||||
<Component Id="starcos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\starcos.profile"/>
|
||||
</Component>
|
||||
<Component Id="westcos.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\westcos.profile"/>
|
||||
</Component>
|
||||
<Component Id="oberthur.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\oberthur.profile"/>
|
||||
</Component>
|
||||
<Component Id="authentic.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\authentic.profile"/>
|
||||
</Component>
|
||||
<Component Id="rutoken.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\rutoken.profile"/>
|
||||
</Component>
|
||||
<Component Id="rutoken_ecp.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\rutoken_ecp.profile"/>
|
||||
</Component>
|
||||
<Component Id="ias_adele_admin1.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\ias_adele_admin1.profile"/>
|
||||
</Component>
|
||||
<Component Id="ias_adele_admin2.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\ias_adele_admin2.profile"/>
|
||||
</Component>
|
||||
<Component Id="ias_adele_common.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\ias_adele_common.profile"/>
|
||||
</Component>
|
||||
<Component Id="iasecc_admin_eid.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\iasecc_admin_eid.profile"/>
|
||||
</Component>
|
||||
<Component Id="iasecc_generic_oberthur.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\iasecc_generic_oberthur.profile"/>
|
||||
</Component>
|
||||
<Component Id="iasecc_generic_pki.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\iasecc_generic_pki.profile"/>
|
||||
</Component>
|
||||
<Component Id="iasecc.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\iasecc.profile"/>
|
||||
</Component>
|
||||
<Component Id="schsm.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\sc-hsm.profile"/>
|
||||
</Component>
|
||||
<Component Id="openpgp.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\openpgp.profile"/>
|
||||
</Component>
|
||||
<Component Id="isoApplet.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\isoApplet.profile"/>
|
||||
</Component>
|
||||
</Directory>
|
||||
<?endif ?>
|
||||
</Directory>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
@ -272,8 +292,14 @@
|
|||
<Feature Id="Complete" Level="1" Title="OpenSC software suite" Display="expand">
|
||||
<Feature Id="OpenSC_core" Level="1" Title="OpenSC core library" Description="Core DLL and configuration file used by all other components." Absent="disallow">
|
||||
<ComponentRef Id="opensc.dll"/>
|
||||
<?ifdef zlib ?>
|
||||
<ComponentRef Id="zlib1.dll"/>
|
||||
<?endif ?>
|
||||
<ComponentRef Id="opensc.conf"/>
|
||||
<ComponentRef Id="smm_local.dll"/>
|
||||
<?ifdef OpenSSL ?>
|
||||
<ComponentRef Id="libeay32.dll"/>
|
||||
<ComponentRef Id="smm_local.dll"/>
|
||||
<?endif ?>
|
||||
</Feature>
|
||||
<Feature Id="OpenSC_pkcs11" Level="1" Title="OpenSC PKCS#11 module" Description="PKCS#11 module usd by most open source and cross-platform software (like Firefox, Putty, TrueCrypt, OpenVPN etc)" TypicalDefault="install">
|
||||
<ComponentRef Id="opensc_pkcs11.dll"/>
|
||||
|
@ -293,47 +319,49 @@
|
|||
<ComponentRef Id="pkcs11_tool.exe"/>
|
||||
<ComponentRef Id="cardos_tool.exe"/>
|
||||
<ComponentRef Id="eidenv.exe"/>
|
||||
<ComponentRef Id="pkcs15_init.exe"/>
|
||||
<ComponentRef Id="dnie_tool.exe"/>
|
||||
<ComponentRef Id="pkcs15_tool.exe"/>
|
||||
<ComponentRef Id="pkcs15_crypt.exe"/>
|
||||
<ComponentRef Id="sc_hsm_tool.exe"/>
|
||||
<ComponentRef Id="openpgp_tool.exe"/>
|
||||
<ComponentRef Id="iasecc_tool.exe"/>
|
||||
<ComponentRef Id="cryptoflex_tool.exe"/>
|
||||
<ComponentRef Id="netkey_tool.exe"/>
|
||||
<ComponentRef Id="piv_tool.exe"/>
|
||||
<ComponentRef Id="westcos_tool.exe"/>
|
||||
<ComponentRef Id="cyberflex.profile"/>
|
||||
<ComponentRef Id="flex.profile"/>
|
||||
<ComponentRef Id="gpk.profile"/>
|
||||
<ComponentRef Id="miocos.profile"/>
|
||||
<ComponentRef Id="incrypto34.profile"/>
|
||||
<ComponentRef Id="jcop.profile"/>
|
||||
<ComponentRef Id="muscle.profile"/>
|
||||
<ComponentRef Id="pkcs15.profile"/>
|
||||
<ComponentRef Id="asepcos.profile"/>
|
||||
<ComponentRef Id="cardos.profile"/>
|
||||
<ComponentRef Id="entersafe.profile"/>
|
||||
<ComponentRef Id="epass2003.profile"/>
|
||||
<ComponentRef Id="myeid.profile"/>
|
||||
<ComponentRef Id="setcos.profile"/>
|
||||
<ComponentRef Id="starcos.profile"/>
|
||||
<ComponentRef Id="westcos.profile"/>
|
||||
<ComponentRef Id="oberthur.profile"/>
|
||||
<ComponentRef Id="authentic.profile"/>
|
||||
<ComponentRef Id="rutoken.profile"/>
|
||||
<ComponentRef Id="rutoken_ecp.profile"/>
|
||||
<ComponentRef Id="ias_adele_admin1.profile"/>
|
||||
<ComponentRef Id="ias_adele_admin2.profile"/>
|
||||
<ComponentRef Id="ias_adele_common.profile"/>
|
||||
<ComponentRef Id="iasecc_admin_eid.profile"/>
|
||||
<ComponentRef Id="iasecc_generic_oberthur.profile"/>
|
||||
<ComponentRef Id="iasecc_generic_pki.profile"/>
|
||||
<ComponentRef Id="iasecc.profile"/>
|
||||
<ComponentRef Id="schsm.profile"/>
|
||||
<ComponentRef Id="openpgp.profile"/>
|
||||
<ComponentRef Id="isoApplet.profile"/>
|
||||
<?ifdef OpenSSL ?>
|
||||
<ComponentRef Id="cryptoflex_tool.exe"/>
|
||||
<ComponentRef Id="pkcs15_init.exe"/>
|
||||
<ComponentRef Id="netkey_tool.exe"/>
|
||||
<ComponentRef Id="piv_tool.exe"/>
|
||||
<ComponentRef Id="westcos_tool.exe"/>
|
||||
<ComponentRef Id="sc_hsm_tool.exe"/>
|
||||
<ComponentRef Id="dnie_tool.exe"/>
|
||||
<ComponentRef Id="cyberflex.profile"/>
|
||||
<ComponentRef Id="flex.profile"/>
|
||||
<ComponentRef Id="gpk.profile"/>
|
||||
<ComponentRef Id="miocos.profile"/>
|
||||
<ComponentRef Id="incrypto34.profile"/>
|
||||
<ComponentRef Id="jcop.profile"/>
|
||||
<ComponentRef Id="muscle.profile"/>
|
||||
<ComponentRef Id="pkcs15.profile"/>
|
||||
<ComponentRef Id="asepcos.profile"/>
|
||||
<ComponentRef Id="cardos.profile"/>
|
||||
<ComponentRef Id="entersafe.profile"/>
|
||||
<ComponentRef Id="epass2003.profile"/>
|
||||
<ComponentRef Id="myeid.profile"/>
|
||||
<ComponentRef Id="setcos.profile"/>
|
||||
<ComponentRef Id="starcos.profile"/>
|
||||
<ComponentRef Id="westcos.profile"/>
|
||||
<ComponentRef Id="oberthur.profile"/>
|
||||
<ComponentRef Id="authentic.profile"/>
|
||||
<ComponentRef Id="rutoken.profile"/>
|
||||
<ComponentRef Id="rutoken_ecp.profile"/>
|
||||
<ComponentRef Id="ias_adele_admin1.profile"/>
|
||||
<ComponentRef Id="ias_adele_admin2.profile"/>
|
||||
<ComponentRef Id="ias_adele_common.profile"/>
|
||||
<ComponentRef Id="iasecc_admin_eid.profile"/>
|
||||
<ComponentRef Id="iasecc_generic_oberthur.profile"/>
|
||||
<ComponentRef Id="iasecc_generic_pki.profile"/>
|
||||
<ComponentRef Id="iasecc.profile"/>
|
||||
<ComponentRef Id="schsm.profile"/>
|
||||
<ComponentRef Id="openpgp.profile"/>
|
||||
<ComponentRef Id="isoApplet.profile"/>
|
||||
<?endif ?>
|
||||
</Feature>
|
||||
<Feature Id="OpenSC_menu" Level="1" Title="Start menu entries" Description="Start menu entries: link to documentation">
|
||||
<ComponentRef Id="ProgramMenuDir"/>
|
||||
|
|
Loading…
Reference in New Issue