pkg: remove non-related tools

Author: viktorTarasov

.appveyor.yml

@@ -6,7 +6,7 @@ platform:
 
 configuration:
   - Release
-  - Light
+#   - Light
 
 environment:
   GH_TOKEN:
@@ -15,10 +15,10 @@ environment:
   OPENPACE_VER: 1.1.3
   ZLIB_VER_DOT: 1.3.1
   matrix:
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    VCVARSALL: "%ProgramFiles(x86)%/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat"
-    OPENSSL_VER: "1.1.1"
-    OPENSSL_DIR: "C:\\OpenSSL-v111"
+#  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+#    VCVARSALL: "%ProgramFiles(x86)%/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat"
+#    OPENSSL_VER: "1.1.1"
+#    OPENSSL_DIR: "C:\\OpenSSL-v111"
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     VCVARSALL: "%ProgramFiles(x86)%/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat"
     OPENSSL_DIR: "C:\\OpenSSL-v30"

appveyor.yml

@@ -6,7 +6,7 @@ platform:
 
 configuration:
   - Release
-  - Light
+#   - Light
 
 environment:
   GH_TOKEN:
@@ -15,10 +15,10 @@ environment:
   OPENPACE_VER: 1.1.3
   ZLIB_VER_DOT: 1.3.1
   matrix:
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    VCVARSALL: "%ProgramFiles(x86)%/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat"
-    OPENSSL_VER: "1.1.1"
-    OPENSSL_DIR: "C:\\OpenSSL-v111"
+#  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+#    VCVARSALL: "%ProgramFiles(x86)%/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat"
+#    OPENSSL_VER: "1.1.1"
+#    OPENSSL_DIR: "C:\\OpenSSL-v111"
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     VCVARSALL: "%ProgramFiles(x86)%/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat"
     OPENSSL_DIR: "C:\\OpenSSL-v30"

src/Makefile.mak

@@ -1,7 +1,6 @@
 TOPDIR = ..
 
-SUBDIRS = common scconf ui sm pkcs15init \
-		  libopensc pkcs11 tools
+SUBDIRS = common scconf ui pkcs15init libopensc pkcs11 tools
 
 default: all
 
@@ -11,14 +10,6 @@ default: all
 SUBDIRS = $(SUBDIRS) minidriver
 !ENDIF
 
-!IF "$(SM_DEF)" == "/DENABLE_SM"
-SUBDIRS = $(SUBDIRS) smm
-!ENDIF
-
-!IF "$(TESTS_DEF)" == "/DENABLE_TESTS"
-SUBDIRS = $(SUBDIRS) tests
-!ENDIF
-
 all::
 	copy /y common\compat_getopt.h getopt.h
 	@for %i in ( $(SUBDIRS) ) do \

src/libopensc/Makefile.mak

@@ -44,8 +44,6 @@ LIBS = $(TOPDIR)\src\scconf\scconf.lib \
 	   $(TOPDIR)\src\common\libscdl.lib \
 	   $(TOPDIR)\src\ui\strings.lib \
 	   $(TOPDIR)\src\ui\notify.lib \
-	   $(TOPDIR)\src\sm\libsmiso.lib \
-	   $(TOPDIR)\src\sm\libsmeac.lib \
 	   $(TOPDIR)\src\pkcs15init\pkcs15init.lib
 
 all: $(TOPDIR)\win32\versioninfo.res $(TARGET)

src/tools/Makefile.mak

@@ -4,9 +4,8 @@ default: all
 
 !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 openpgp-tool.exe iasecc-tool.exe safenet-tool.exe \
-		opensc-notify.exe egk-tool.exe goid-tool.exe dtrust-tool.exe \
+TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe \
+		pkcs11-tool.exe iasecc-tool.exe safenet-tool.exe \
 		opensc-asn1.exe pkcs11-register.exe $(PROGRAMS_OPENSSL) $(PROGRAMS_OPENPACE)
 
 OBJECTS = util.obj versioninfo-tools.res

win32/Make.rules.mak

@@ -60,8 +60,7 @@ OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\$(PLATFORM)\$(BUILD_TYPE)\libcrypto_static.l
 !ENDIF
 OPENSSL_LIB = $(OPENSSL_LIB) user32.lib advapi32.lib crypt32.lib ws2_32.lib
 
-PROGRAMS_OPENSSL = cryptoflex-tool.exe pkcs15-init.exe netkey-tool.exe piv-tool.exe \
-	westcos-tool.exe sc-hsm-tool.exe dnie-tool.exe gids-tool.exe
+PROGRAMS_OPENSSL = pkcs15-init.exe  
 OPENSC_FEATURES = $(OPENSC_FEATURES) openssl
 WIXFLAGS = -d OpenSSL="$(OPENSSL_DIR)" $(WIXFLAGS)
 !ENDIF
@@ -94,26 +93,6 @@ WIXFLAGS = -d zlib="C:\zlib-dll" $(WIXFLAGS)
 !ENDIF
 
 
-# If you want support for EAC:
-# - Download OpenPACE and
-# - uncomment the line starting with OPENPACE_DEF 
-# - set the OPENPACE_INCL_DIR below to the OpenPACE include directory preceded by "/I"
-# - set the OPENPACE_LIB  below to your OpenPACE lib file
-#OPENPACE_DEF= /DENABLE_OPENPACE
-!IF "$(OPENPACE_DEF)" == "/DENABLE_OPENPACE"
-!IF "$(OPENPACE_DIR)" == ""
-OPENPACE_DIR = C:\openpace
-!ENDIF
-OPENPACE_INCL_DIR = /I$(OPENPACE_DIR)\src
-OPENPACE_LIB = $(OPENPACE_DIR)\src\libeac.lib
-!IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL"
-# Build only when OpenPACE and OpenSSL are available
-PROGRAMS_OPENPACE = npa-tool.exe
-!ENDIF
-WIXFLAGS = -d OpenPACE="$(OPENPACE_DIR)" $(WIXFLAGS)
-!ENDIF
-
-
 # Used for MiniDriver
 CPDK_INCL_DIR = "/IC:\Program Files (x86)\Windows Kits\10\Cryptographic Provider Development Kit\Include"
 

win32/OpenSC.wxs.in

@@ -107,9 +107,6 @@
         <?ifdef zlib ?>
           <ComponentRef Id="zlib1.dll" />
         <?endif?>
-        <?ifdef OpenSSL ?>
-          <ComponentRef Id="smm_local.dll" />
-        <?endif?>
         <?ifdef OpenPACE ?>
           <File Directory="INSTALLDIR_CVC" Source="$(var.SOURCE_DIR)\etc\DESRCACC100001" />
           <File Directory="INSTALLDIR_CVC" Source="$(var.SOURCE_DIR)\etc\DESCHSMCVCA00001" />
@@ -119,7 +116,6 @@
       <Feature Id="OpenSC_pkcs11" Level="1" Title="PKCS#11 module"
           Description="Security module that can be used by most cross-platform software, for example Firefox, Thunderbird, OpenVPN, etc.">
         <File Directory="INSTALLDIR_PKCS11" Source="$(var.SOURCE_DIR)\src\pkcs11\opensc-pkcs11.dll" />
-        <File Directory="INSTALLDIR_PKCS11" Name="onepin-opensc-pkcs11.dll" Source="$(var.SOURCE_DIR)\src\pkcs11\opensc-pkcs11.dll" />
       </Feature>
 
       <Feature Id="PKCS11_spy" Level="1" Title="PKCS#11 Spy module"
@@ -167,19 +163,6 @@
         <?endif?>
         <File Id="opensc.dll" Directory="INSTALLDIR_TOOLS" Source="$(var.SOURCE_DIR)\src\libopensc\opensc.dll" />
         <Files Directory="INSTALLDIR_TOOLS" Include="$(var.SOURCE_DIR)\src\tools\*.exe" />
-
-        <?ifdef OpenSSL ?>
-          <File Directory="INSTALLDIR_TOOLS" Id="smm_local.dll" Source="$(var.SOURCE_DIR)\src\smm\smm-local.dll" />
-          <Files Directory="INSTALLDIR_PROFILES" Include="$(var.SOURCE_DIR)\src\pkcs15init\*.profile" />
-        <?endif?>
-
-        <Feature Id="OpenSC_autostart" Level="1" Title="Autostart entries"
-            Description="After login, start smart card notifications.">
-          <Component Condition="BUILD_ARCH = NATIVE_ARCH">
-            <RegistryValue Root="HKMU" Key="Software\Microsoft\Windows\CurrentVersion\Run"
-              Type="string" Name="opensc-notify.exe" Value="[INSTALLDIR_TOOLS]\opensc-notify.exe" />
-          </Component>
-        </Feature>
       </Feature>
 
       <Feature Id="OpenSC_menu" Level="1" Title="Start menu entries"