Commit Graph

202 Commits

Author SHA1 Message Date
Frank Morgner 90fb40f65e include zlib1.dll and libeay32.dll in installer 2015-09-30 07:13:59 +02:00
Frank Morgner 9f7583a022 fixed indenting error in Makefile 2015-09-30 06:26:13 +02:00
Frank Morgner a7bd14c77f Builds lightweight Windows binaries by default
... without OpenSSL and zlib
2015-09-25 10:58:53 +02:00
Frank Morgner 97f8731402 Properly describe OpenSSL dependencies in WiX installer 2015-09-24 09:40:52 +02:00
Frank Morgner e14e028453 Properly describe OpenSSL dependencies in .mak files 2015-09-23 08:23:28 +02:00
Frank Morgner 547494f012 Merge pull request #552 from frankmorgner/innosetup
Improve the state of travis ci
2015-09-17 13:23:56 +02:00
Frank Morgner 8aba7b9598 added missing files to WiX installer
fixes https://github.com/OpenSC/OpenSC/issues/488
2015-09-16 04:18:12 +02:00
Frank Morgner fcfb0cebee build cross compiled installer with innosetup 2015-09-15 15:04:33 +02:00
Frank Morgner a524b4a0e3 Removes obsolete windows installer files 2015-09-15 15:04:33 +02:00
Frank Morgner 69783f4e6c Unifies project wide vendor/product strings 2015-09-15 15:04:32 +02:00
Frank Morgner 428385d8b4 adjust Make.rules.mak to work with AppVeyor
- The AppVeyor configuration of VS2014/VS2015 does not currently work
  with this script
- We are using the pre-built zlib binaries. As consequence, we can build
  the 32 bit installer only. Also, we can't use static linking anymore
- The current pre-built binaries of OpenSSL from
  https://slproweb.com/products/Win32OpenSSL.html include security
  measures (https://blogs.microsoft.com/cybertrust/2012/01/26/enhancements-to-gs-in-visual-studio-11/)
  that are not compatible with our version of VS `(error LNK2001:
  unresolved external symbol ___report_rangecheckfailure)`. That's why
  we can't use static linking anymore

works with
- OpenSSL 1.0.2
- zlib 2.1.8
- WiX 3.10
2015-09-14 10:52:31 +02:00
adminmt 56c376489f ATR update card-masktech.c, customactions.cpp
changed atqb + mask of MaskTech smart card (a) and (c)
removed MaskTech smart card (d)
added atr mask to MaskTech smart card (a) and (b)
2015-08-24 12:51:54 +02:00
vletoux 01b395e636 card-masktech.c: add 2 more ATR
Fixes #465
2015-05-16 12:09:08 +02:00
Raul Metsma 6349836ba2 Include onepin-opensc-pkcs11.dll in installer
Fixes #466
2015-05-16 12:03:08 +02:00
vletoux 7784d24ee1 win32/customactions.cpp: add the MaskTech card minidriver registration data 2015-05-10 15:04:44 +02:00
vletoux ac82a96ccc minidriver: add my name in the author list
setup: change the url to match the new one
2015-05-10 15:04:44 +02:00
vletoux 2f6d1b5c97 avoid the failure: "Failed to get file version of custom action dll" 2015-05-10 15:04:44 +02:00
vletoux 0b683472b0 win32 setup: add basic minidriver card registration and unregistration via a custom action 2015-05-10 15:04:44 +02:00
vletoux 9e07a75968 detect the wix components installed on the build machine 2015-05-10 15:04:44 +02:00
vletoux 5a1ca44c11 custom action skeleton (without actions) - help welcome ... 2015-05-10 15:04:44 +02:00
vletoux 017d98f87f trying to fix image path when compiling 2015-05-10 15:04:44 +02:00
vletoux 9601041f75 win32 setup:
* change the default wix background image (aka brand the setup)
* add the missing ARPCONTACT property
2015-05-10 15:04:35 +02:00
Philip Wendland 3312c1e2b9
IsoApplet: install isoApplet.profile on windows 2015-02-20 21:55:35 +01:00
Frank Morgner 28ea6bc607 added DEFAULT_PKCS11_PROVIDER to winconfig.h.in 2015-01-20 00:53:51 +01:00
Viktor Tarasov df959efab5 md: install minidriver by default 2014-09-07 21:08:54 +02:00
Viktor Tarasov 0fa475ee5f build: define in configure.ac.in the common fields of version-info 2013-12-30 10:31:21 +01:00
Viktor Tarasov aec6f99ff4 win32: build: add 'VarFileInfo' block to version-info 2013-12-29 22:00:29 +01:00
Viktor Tarasov 53ed5dc502 win32: build: 'version-info' resource for each target 2013-12-29 22:00:29 +01:00
German Blanco 63ce563d76 Adding support for DNIe. 2013-06-13 17:31:56 +02:00
Viktor Tarasov 7a57fa8689 win32: build and include to MSI package 'openpgp-tool.exe' 2013-02-25 19:12:06 +01:00
Viktor Tarasov 3f30e14087 sm: move SM common crypto procedures to the dedicated library
rename 'sm' source directory
2013-01-04 22:29:59 +01:00
Andreas Schwier ffb20e5916 sc-hsm: Added sc-hsm-tool with DKEK support and key wrap / unwrap 2012-11-11 12:53:03 +01:00
Viktor Tarasov 8d35b2cf58 build MSI: add openpgp.profile 2012-11-11 00:57:09 +01:00
Viktor Tarasov 4b9e82d392 MSI: illegal caracters in component ID
OpenSC.wxs(168) : error CNDL0014 : The Component/@Id attribute's value, 'sc-hsm.profile', is not a legal identifier.  Identifiers may contain ASCII characters A-Z, a-z, digits, underscores (_), or periods (.).  Every identifier must begin with either a letter or an underscore.
2012-10-01 13:30:35 +02:00
Andreas Schwier 72786abe1f sc-hsm: Added write support for RSA and ECC keys, certificates and data objects 2012-10-01 13:09:02 +02:00
Viktor Tarasov 961059a052 build: include to 'dist' the files used by Windows build 2012-09-12 10:50:51 +02:00
Viktor Tarasov 7c05e8ce21 win32: build debug version, updates to MSI
Build with debug options,
include profiles and SM module into MSI.
2012-06-08 20:17:36 +02:00
Viktor Tarasov d1cf65754b pkcs11: no more 'hacked' mode and 'onepin' module version
'OnePIN' version of opensc-pkcs11 module is not installed.
Instead, in the 'pkcs11' section of OpenSC configuration,
there is a possibility to define in a different manner
how to create slots for the present PINs and applications.
2012-05-21 19:19:38 +02:00
Viktor Tarasov 2ffa346eff OpenSC.msi: install opensc.dll into the 'tools' directory
Now the DLLs installed into the 'system' directory are static.
Only opensc tools depend on opensc.dll.
2011-06-14 14:56:49 +02:00
Viktor Tarasov 6bddab7417 win32: 'Minimal Size' code optimization 2011-06-14 11:34:25 +02:00
martin df7d560c35 WindowsInstaller: Use OpenSC version information in Windows file version resource.
* Fix license information in file info (GPL->LGPL)

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5378 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-20 14:53:07 +00:00
martin 4f768fcdc5 WindowsInstaller: Fix warning CNDL1069 about deprecated attribute
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5365 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 10:51:01 +00:00
martin 404d84ae48 WindowsInstaller: Fix Wix warning:
Z:\opensc\win32\OpenSC.wxs(22) : warning CNDL1121 : Package/@InstallerVersion must be 200 or greater for a 64-bit package.
The value will be changed to 200. Please specify a value of 200 or greater in order to eliminate this warning.

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5364 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-19 10:50:52 +00:00
martin c0c0882a1e WindowsInstaller: split the UpgradeCode for x86 and x64, so that both versions could be installed in parallel on x64
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5360 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-18 10:01:32 +00:00
martin 1c244f8644 WindowsInstaller: fix "parallel installs"
Before this change, installing a new MSI would create a new OpenSC entry in "Add/Remove programs".
Now correctly a single instance exists and a seamless upgrade can be done.

Make the URL-s for support information more specific and add the OpenSC icon to the programs list.

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5358 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-18 09:29:15 +00:00
martin 4072b2bc0d WindowsInstaller: fix x86 build after r5351
error CNDL0150 : Undefined preprocessor variable '$(var.PlatformProgramFilesFolder)'.
NMAKE : fatal error U1077: '"C:\Program Files\Windows Installer XML v3.6\bin\candle.exe"' : return code '0x96'

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5354 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 16:58:09 +00:00
martin b0c200c885 WindowsInstaller: Always use a canonical name for OpenSC related registry entries.
This fixes the 64bit build looking for registry keys under "OpenSC (64 bit)" which is the name of the package.

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5353 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 16:12:03 +00:00
martin 15d6ecddc6 WindowsInstaller: One more fix for x64 installer: opensc.conf
c:\jenkins\workspace\OpenSC_win64_nightly\win32\OpenSC.wxs(61) : error LGHT0204 : ICE80: This 32BitComponent opensc.conf uses 64BitDirectory INSTALLDIR
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Windows Installer XML v3.6\bin\light.exe"' : return code '0xcc'

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5352 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 13:18:11 +00:00
martin 5ccfeddf46 WindowsInstaller: Add win64 flag even to platform-independent files.
* Install to "System64Folder" on x64

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5351 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 13:05:47 +00:00
martin 82258b01f7 WindowsInstaller: fix typo, causing the x86 installer to claim to be x64
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5350 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 12:50:30 +00:00
martin e2aac209d2 WindowsInstaller: amend r5345, Win64 is a property of a Component, not File
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5347 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-16 14:25:21 +00:00
martin 3e20fab565 Add back removed product name
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5346 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-16 14:14:56 +00:00
martin af098605d7 WindowsInstaller: set Win64 flag for binaries when building for win64 and use the right program files folder.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5345 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-16 14:10:07 +00:00
martin 7c17247446 WindowsInstaller: enable zlib by default.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5330 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-12 07:48:53 +00:00
martin 44cf3d06ae MiniDriver: rename cardmod to minidriver in source.
Also change some grammar, whitespace (reported by git) and wording (Opensc->OpenSC) issues.
Add some comments here and there.

See http://www.opensc-project.org/pipermail/opensc-devel/2011-April/016261.html

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5329 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-12 07:40:12 +00:00
martin 639ca655b6 WindowsInstaller: Correct support for x64 builds
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5327 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-11 14:42:48 +00:00
vtarasov 4ec415f605 msi: no need backslash after [INSTALLDIR]
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5307 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-07 17:14:56 +00:00
martin 0961818a8f WindowsInstaller: remove variable, added too early.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5296 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-06 08:22:15 +00:00
martin 25c2d497b2 WindowsInstaller: reduce the warning level, parsing error output on level 4 takes Jenkins warnings plugin 25 minutes.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5295 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-06 08:10:25 +00:00
martin dbaad0ab94 WindowsInstaller: Simplify the wix script even further. Thanks to Kalev Lember.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5294 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-06 08:07:57 +00:00
martin db3ebb1514 WindowsInstaller: set the product version programmatically for MSI
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5293 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 10:35:28 +00:00
martin 1f5534323e WindowsInstaller: display the LGPL license in the installer.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5292 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 08:29:30 +00:00
martin 5162ec0634 WindowsInstaller: re-work WiX installer file for OpenSC. Add meaningful components.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5291 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 08:04:16 +00:00
martin 2c5583513b WindowsInstaller: Using /Wall was a bad idea, use /W4 instead.
http://stackoverflow.com/questions/4001736/what-with-the-thousands-of-warnings-in-standard-headers-in-msvc-wall

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5290 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 08:04:10 +00:00
martin 282f6dc6db Enable all warnings on MSVC
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5289 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 07:44:19 +00:00
martin ccee81d8a2 WindowsInstaller: create an internet shortcut to start menu. Wix invocation change.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5288 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 06:42:34 +00:00
martin d0639e0776 WindowsInstaller: Separate makefile changes for building for x64 and building on x64.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5287 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-03 07:41:56 +00:00
martin ea7eb699e5 WindowsInstaller: build for x64 with nmake -f Makefile.mak BUILD_TYPE=WIN64
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5286 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-01 08:06:25 +00:00
martin 5ab9919610 WindowsInstaller: link against crypt32.lib
libeay32MT.lib(e_capi.obj) : error LNK2019: unresolved external symbol __imp__CertFreeCertificateContext@4 referenced in function _capi_free_key

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5285 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 12:04:57 +00:00
martin 223a8b90e5 WindowsInstaller: tune for default build
* remove opensc-msi folder, everything related to building on/for Windows is in /win32
 * OpenSC shall be built in static mode
 * set default paths for OpenSSL Win32 installer locations
 * build with OpenSSL by default

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5284 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 11:28:29 +00:00
martin b6c606ad91 WindowsInstaller: opensc.conf is (incorrectly) generated with make. This is not run on Windows. Use opensc.conf.in as the template for the *example* config file on Windows.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5283 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 10:34:12 +00:00
martin f6ac8b6f56 WindowsInstaller: fix .ico path. Everything related to building on/for Windows is in win32/
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5282 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 10:24:28 +00:00
martin f2fac5b7b5 WindowsInstaller: Build MSI by default on native Windows build.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5281 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 09:18:23 +00:00
vtarasov d174edf1d2 msi: fix component ID of the rutoken profiles
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5227 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-12 15:17:02 +00:00
vtarasov dda747f8fc msi: include 'cardmod.dll' and 'rutoken' PKCS#15 profiles into MSI
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5226 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-12 14:20:13 +00:00
dengert c5b2b021be opensc-cardmod.dll can now by built as "static"
using the VS. The dll will contain all of OpenSC,
OpenSSL and zlib in a single dll, and thus can
reside anywere. Without this, winlogin would require
it to reside in system32. 


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5212 c6295689-39f2-0310-b995-f0e70906c6a9
2011-02-18 20:48:22 +00:00
vtarasov 47b1c9a86d opensc-msi: do not install libltdl
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5209 c6295689-39f2-0310-b995-f0e70906c6a9
2011-02-17 17:26:43 +00:00
martin ffb46d2573 core: reanimate the sc_dlopen API for dynamic loading
* shift libpkcs11 from src/pkcs11 to src/common as it is not used to implement the OpenSC PKCS#11 module
 * invent a "libscdl" mini library that implements either libltdl based dynamic loading or uses native interfaces
 * drop hard requirement for libltl to build OpenSC
 * native Windows build does not need libltdl any more
 * specify CNGSDK include dir to find cardmod.h. CNGSDK only registers with a handful of compilers

Deals with #323

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5201 c6295689-39f2-0310-b995-f0e70906c6a9
2011-02-16 19:02:11 +00:00
martin 3dce2e08d4 WindowsInstaller: generate OpenSC.iss with autotools
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5008 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-30 15:10:06 +00:00
vtarasov 1a58c429cb 'AuthentIC': basic support of Oberthur's 'COSMO.v7/AuthentIC.v3.2' ...
it's the natively PKCS#15 card


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5006 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-30 14:40:28 +00:00
martin 72c0474dde Prepare for 0.12.0
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4980 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-22 17:12:11 +00:00
martin 7f32e7a079 Build 0.12.0-rc2
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4961 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-17 10:15:11 +00:00
vtarasov 26df6abcd9 win32: default install dir 'Program Files\OpenSC Project\OpenSC'
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4941 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-12 11:40:42 +00:00
vtarasov af8e8dc815 win32: path to OpenSC registry keys have been changed
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4936 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-09 09:38:10 +00:00
vtarasov ad60428d09 win32: build MSI
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4932 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-09 09:16:03 +00:00
martin f5e21e0ba0 Complete change, SIMCLIST_DUMPRESTORE is by default off.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4925 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-06 18:35:43 +00:00
vtarasov d775407327 win32: when cleaning delete also manifest files
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4921 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-06 15:49:49 +00:00
vtarasov 04c5cb955b win32: control from Make.rules.mak the including of 'cardmod'
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4920 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-06 15:47:03 +00:00
vtarasov e353c1bf2f win32: 'netkey' and 'westcos' tools are OpenSSL dependents
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4919 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-06 15:20:19 +00:00
vtarasov 31a33d0b1e win32: _PATH_MAX not defined when compiling with VS ...
use instead the standard FILENAME_MAX


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4909 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-06 08:31:59 +00:00
martin c4a9ab6732 WindowsInstaller: overwrite files with same version to allow nightly builds; replace and delete blocked files on a reboot.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4887 c6295689-39f2-0310-b995-f0e70906c6a9
2010-11-29 08:51:17 +00:00
martin 2d6e3bd262 EstonianEid: remove the iconv dependency and use the common name from the certificate as the card label.
This makes it universal, as some cards don't have the personal data file (Digi-ID)
It also makes it a bit ugly, as the common name is the name and personal ID code
concatenated like "FIRSTNAME,LASTNAME,123456789"

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4817 c6295689-39f2-0310-b995-f0e70906c6a9
2010-10-19 11:25:25 +00:00
martin 61572d590a WindowsInstaller: be flexible with make dist result name.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4796 c6295689-39f2-0310-b995-f0e70906c6a9
2010-10-06 07:53:59 +00:00
martin dcd077243f WindowsInstaller: simplify the installer creation process
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4794 c6295689-39f2-0310-b995-f0e70906c6a9
2010-10-06 07:10:50 +00:00
martin c5d18635ef build: add installer files and a small script to build a win32 installer from build project binaries.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4653 c6295689-39f2-0310-b995-f0e70906c6a9
2010-08-25 12:57:47 +00:00
viktor.tarasov ac41eba3ac win32: merge the branches/vtarasov/opensc-sm.trunk
update win32 compilation;
Unix style line ending in src/pkcs15init/pkcs15-oberthur.h;
variables declaration issue in src/tools/cardos-tool.c.



git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4280 c6295689-39f2-0310-b995-f0e70906c6a9
2010-05-01 12:15:36 +00:00
martin bd93c92b23 win32/Makefile.am:1: whitespace following trailing backslash
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4089 c6295689-39f2-0310-b995-f0e70906c6a9
2010-03-05 19:31:07 +00:00
aj d22a2483c0 Header file cleanup.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4081 c6295689-39f2-0310-b995-f0e70906c6a9
2010-03-04 08:14:36 +00:00
alonbl a6f9f023a0 [WINDOWS] Remove tool specific file description support resource file
The implementation was based on the previous MSC build, each tool had its own
description in version resource.

This change sets a single version resource to all files, and produces much
simpler build.



git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3980 c6295689-39f2-0310-b995-f0e70906c6a9
2010-02-02 14:50:42 +00:00
martin 830ba34b67 Fix native windows build, add iconv support
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3643 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-29 11:47:45 +00:00