andre
be2c17c7e9
pkcs11: Fixes leftover from r4646.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5313 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-08 13:50:02 +00:00
andre
69c846f904
libopensc: Re-defines SC_CARD_FLAG_ONBOARD_KEY_GEN to be local to the file card-flex.c, because that flag is used nowhere else. In principle, this patch only reverts some changes made by r2192.
...
Relates to #296 .
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5312 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-08 13:30:32 +00:00
vtarasov
cfffb7f5dd
piv-tool: 'admin' and 'genkey' options need an argument ...
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5311 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-08 12:28:59 +00:00
vtarasov
a5d1058157
pkcs15-tool: print GUID for private key
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5310 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-08 10:03:42 +00:00
vtarasov
b8b4c74d07
pkcs15-tool: print key reference in a decimal and hexadecimal formats
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5309 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-08 09:57:38 +00:00
andre
b21eeb46b9
libopensc: Removes unused flag SC_CARD_CAP_RSA_2048.
...
Relates to [http://www.opensc-project.org/opensc/ticket/296#comment:1 #296 ].
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5308 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-07 18:16:40 +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
vtarasov
6c1862eea6
minidriver: use common routines to get serialized GUID
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5306 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-07 16:58:01 +00:00
vtarasov
74208f1814
minidriver: resolve 'unreferenced variable' and 'comparaison signed with unsigned' warnings
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5305 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-07 16:55:07 +00:00
vtarasov
be46a660e7
libopensc: export names of the 'get GUID' routines
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5304 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-07 16:46:38 +00:00
vtarasov
17fea1f65f
pkcs15-tool: include GUID to the printed certificate info
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5303 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-07 16:43:54 +00:00
vtarasov
f8ba3ea76d
libopensc: general routines to get serialized GUID
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5302 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-07 16:42:23 +00:00
andre
89b975022c
opensc.h: Removes unused flag SC_CARD_CAP_EMV.
...
Relates to [http://www.opensc-project.org/opensc/ticket/296#comment:1 #296 ].
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5301 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-07 16:18:56 +00:00
andre
213fa68ea0
card-setcos.c: Fixes misuse of SC_CARD_FLAG_ONBOARD_KEY_GEN. From [ http://www.opensc-project.org/opensc/browser/trunk/src/libopensc/opensc.h?rev=5299#L411 opensc.h]:
...
#define SC_CARD_FLAG_ONBOARD_KEY_GEN 0x00000001
#define SC_CARD_CAP_APDU_EXT 0x00000001
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5300 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-07 15:38:22 +00:00
andre
ac3a48d7ca
pkcs15.h: Fixes type inconsistency, because in [ http://www.opensc-project.org/opensc/browser/trunk/src/libopensc/opensc.h?rev=5190#L148 opensc.h] algo_ref is defined as unsigned int.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5299 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-06 22:46:46 +00:00
andre
93deff0161
dir.c: Avoid warnings:
...
dir.c:212: warning: comparison between signed and unsigned
dir.c:220: warning: comparison between signed and unsigned
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5298 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-06 15:11:18 +00:00
andre
d3215b67df
asn1.c: Avoid warnings:
...
asn1.c:747: warning: comparison between signed and unsigned
asn1.c:785: warning: comparison between signed and unsigned
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5297 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-06 15:06:02 +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
martin
19aff30b03
opensc-explorer: use relative addressing in do_cat
...
'cat' takes a file_id as argument. This should be selected relative
to the currently selected DF instead of being treated as an ID.
(compare with 'get' that also takes a file_id argument)
See http://www.opensc-project.org/pipermail/opensc-devel/2011-March/016172.html
Signed-off-by: Peter Marschall <peter@adpm.de>
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5280 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 07:45:19 +00:00
martin
71daf094de
opensc-explorer: re-factor do_cat()
...
* use strlen(..) instead of sizeof(..)-1
- easier to read
- avoids errors if string is defined with explicit size
* bring sfi:-related code closer together
See http://www.opensc-project.org/pipermail/opensc-devel/2011-March/016172.html
Signed-off-by: Peter Marschall <peter@adpm.de>
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5279 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 07:45:13 +00:00
martin
7939d8b723
opensc-explorer: re-factor print_file()
...
See http://www.opensc-project.org/pipermail/opensc-devel/2011-March/016172.html
Signed-off-by: Peter Marschall <peter@adpm.de>
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5278 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 07:45:08 +00:00
martin
f63c85d4cd
opensc-explorer: support writing to stdout in 'get'
...
Treat the value '-' of the second parameter to get special.
If it is given, use stdout as the file to write to.
See http://www.opensc-project.org/pipermail/opensc-devel/2011-March/016172.html
Signed-off-by: Peter Marschall <peter@adpm.de>
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5277 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 07:44:59 +00:00
martin
d26d23ccfc
man pages: fix piv-tool XML syntax
...
tools/piv-tool.xml:28: parser error : Opening and ending tag mismatch: refsect1 line 21 and para
</para>
^
Thanks to Juan Antonio for noticing: http://www.opensc-project.org/pipermail/opensc-devel/2011-March/016227.html
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5276 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-30 10:36:17 +00:00
dengert
d77f1576ad
Add piv-tool.xml to list of man pages to be built
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5275 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-29 18:11:45 +00:00
dengert
6701d063c3
Add a piv-tool.xml for man page. See #338
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5274 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-29 18:08:22 +00:00
martin
cd3012f55e
Fix #340 : ignore pinpad properties of readers known to be broken.
...
On Mac OS X the HP smart card keyboard claims secure PIN entry support but the PIN is transmitted to host.
Disregard the pinpad flag for this reader. Other readers claiming pinpad support but having problems to follow in this list.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5273 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-29 11:36:45 +00:00
martin
4393f7231e
eidenv: update copyright and correct used license to match the rest of OpenSC.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5272 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-29 11:36:39 +00:00
vtarasov
eae680501a
cardmod: when getting serial number use GET_SERIAL ctl call ...
...
rather then card->serialnr value. Not all card drivers initialize this member.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5271 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-25 18:19:28 +00:00
vtarasov
0d9b40fc04
cardmod: adopt classic form for container's GUID ...
...
also:
- debug function to dump the objects;
- function to get pin by role, used in CardAuthenticateEx();
- CALG_* flags are not translated into the SC_ALGORITHM_RSA_HASH_* flags
(http://www.opensc-project.org/pipermail/opensc-devel/2011-March/016130.html );
- minor changes to the procedure to find the keys.
tested with 'ruToken ECP' and 'IAS/ECC' from Sagem
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5270 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-23 18:37:46 +00:00
ludovic.rousseau
fe630c884f
Fix a real bug (and a compiler warning)
...
pkcs15-oberthur.c: In function 'sc_pkcs15emu_oberthur_add_pubkey':
pkcs15-oberthur.c:585: warning: statement with no effect
pkcs15-oberthur.c: In function 'sc_pkcs15emu_oberthur_add_cert':
pkcs15-oberthur.c:654: warning: statement with no effect
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5269 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-23 17:17:07 +00:00
ludovic.rousseau
04154504a1
Fix compiler warning
...
pkcs15-init.c: In function 'verify_pin':
pkcs15-init.c:2840: warning: declaration of 'r' shadows a previous local
pkcs15-init.c:2836: warning: shadowed declaration is here
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5268 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-23 16:12:21 +00:00
ludovic.rousseau
b435f6007a
Fix compiler warning
...
pkcs15-itacns.c: In function 'itacns_add_data_files':
pkcs15-itacns.c:478: warning: declaration of 'list_size' shadows a global declaration
../../src/common/simclist.h:497: warning: shadowed declaration is here
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5267 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-23 16:05:24 +00:00
ludovic.rousseau
8c0dbf4b02
Fix compiler warning
...
card-iasecc.c: In function 'iasecc_get_serialnr':
card-iasecc.c:2218: warning: declaration of 'ii' shadows a previous local
card-iasecc.c:2165: warning: shadowed declaration is here
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5266 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-23 16:02:42 +00:00
ludovic.rousseau
0e6b87b135
Fix compiler warning
...
card-iasecc.c: In function 'iasecc_select_file':
card-iasecc.c:647: warning: declaration of 'rv' shadows a previous local
card-iasecc.c:635: warning: shadowed declaration is here
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5265 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-23 16:01:45 +00:00
ludovic.rousseau
161678d8a6
Fix compiler warning
...
card-iasecc.c:1529: warning: declaration of 'ffs' shadows a global declaration
/usr/include/string.h:121: warning: shadowed declaration is here
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5264 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-23 16:00:56 +00:00