martin
4d5c61d90c
Correct PC/SC -> OpenSC error code translation.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3626 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-19 11:57:20 +00:00
martin
5a7515cd7f
Recognize SCARD_E_NO_SERIVCE:
...
{{{
$ /Library/OpenSC/bin/opensc-tool -a
[opensc-tool] reader-pcsc.c:881:pcsc_detect_readers: SCardEstablishContext failed: 0x8010001d
[opensc-tool] reader-pcsc.c:990:pcsc_detect_readers: returning with: Unknown error
No smart card readers found.
}}}
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3625 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-18 23:16:53 +00:00
alonbl
2b41afbb3f
Set hardcoded default for profile_dir
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3624 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-16 21:27:46 +00:00
alonbl
cdbd4c1193
More iconv build fixes
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3623 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-16 20:52:36 +00:00
alonbl
96d387b5e9
Fix external iconv override
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3622 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-16 20:21:27 +00:00
alonbl
c9c6f9f2b2
Correct iconv support
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3621 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-16 17:48:26 +00:00
alonbl
51824acab7
Revert r3612, the autoconf warning is correct and be the default in future
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3620 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-16 17:13:32 +00:00
martin
0876222c5f
Make PKCS#11 module default slot configuration more sensible:
...
* Increase default slot count to 16, which equals 4 concurrent readers by default
* 2 OpenCT + 2 PC/SC on Linux for example
* Rename num_slots to slots_per_card
* Rename internal PKCS#11 variables, remove unneeded defines.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3619 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-16 16:44:35 +00:00
martin
c6f753dc00
Limit virtual OpenCT readers to a sane default of 2 readers/tokens by default.
...
Most users don't use more than one or two tokens concurrently. This way default configuration (or with no configuration file) works even after you insert a PC/SC reader as OpenCT does not "eat up" all PKCS#11 slots with 5 virtual readers.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3618 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-16 16:12:50 +00:00
martin
300dfeb088
link with iconv on Mac OS X, to support [3616]
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3617 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-15 23:55:00 +00:00
martin
6ffec42055
Linux compatible PKCS#11-friendly changes to EstEID PKCS#15 emulation driver to display the name of the cardholder in token label field.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3616 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-15 23:20:48 +00:00
martin
315c0edc6e
PC/SC readers have always only one slot per reader.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3615 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-15 21:40:44 +00:00
martin
2e2a998f10
Remove some unused/prehistoric defines.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3614 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-15 21:23:09 +00:00
martin
7e7b94d879
Fix PKCS#15 emulation handling:
...
* Work as expected without a configuration file
* "Normalize" the configuration file: show the used default and give examples with opposite values.
* DWIM:
* If there is no config file: try all builtin drivers
* If there is a configuration file, allow to turn emulation off
* If there is a configuration file, allow to filter the list of internal drivers
* Introduce a PKCS#15 layer card flag for emulated cards
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3613 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-15 21:08:30 +00:00
martin
6f72e22b31
Get rid of configure warnings:
...
{{{
configure: WARNING: winscard.h: accepted by the compiler, rejected by the preprocessor!
configure: WARNING: winscard.h: proceeding with the compiler's result
}}}
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3612 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-15 20:05:09 +00:00
martin
86fe58e326
Provide default system PCSC_CFLAGS on Mac OS X
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3611 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-15 20:01:52 +00:00
martin
c64fd881e9
Mac OS X 10.5.6 fixes the ATR padding bug.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3610 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-15 20:01:09 +00:00
alonbl
1809d50799
Fix doc build issues
...
1. VPATH issue.
2. Parallel build issue, suggested by Ludovic Rousseau.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3609 c6295689-39f2-0310-b995-f0e70906c6a9
2009-01-01 20:55:50 +00:00
alonbl
8828faeccf
Allow delete data objects by specifying application-name and label
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3608 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-28 21:28:53 +00:00
alonbl
8456a321f8
Add PKCS#11 specification limitation note
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3607 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-28 18:45:29 +00:00
alonbl
8c364fdd54
Typeo
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3606 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-28 18:37:03 +00:00
aj
8a6bc59e66
Create new type "privdata" in all profiles with different
...
ACL settings, and check C_CreateObject parameter CKA_PRIVATE aka
pkcs15_create_data args.auth_id variable, aka sc_pkcs15init_new_object
object->flags & SC_PKCS15_CO_FLAG_PRIVATE to decide if "data" or "privdata"
profile needs to be used.
Tested with cryptoflex 32k and opensc-explorer, now I no longer can
"get" the data object file stored with "--private".
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3605 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-28 16:07:51 +00:00
aj
a89b14668f
Enable lock_login by default for security.
...
Disable soft_keygen by default for security.
Make defaults code more readable.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3604 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-28 16:01:04 +00:00
ludovic.rousseau
6e56f8384a
#include <wintypes.h> on __APPLE__ to define DWORD, LONG, etc. Windows types
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3603 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-11 09:18:09 +00:00
martin
5b5a7d3c58
Upgrade to safe and sane values of late 2008
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3602 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-06 20:04:11 +00:00
alonbl
5617c9d535
Fix bug #86 , thanks to ville.skytta
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3601 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-06 18:49:58 +00:00
martin
de89aa47e7
Fixes #109
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3600 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-06 11:41:00 +00:00
martin
f4c85e7502
Cosmetic fix for [3595]
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3599 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-05 15:57:51 +00:00
martin
94d0f8d835
Remove ancient unused code
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3598 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-05 15:53:31 +00:00
martin
a7967258aa
DWIM: If you don't specify a reader on the command line and you have more than one reader (for example, OpenCT virtual readers and one existing PC/SC reader) the tools will skip to the first reader that has a card in it.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3597 c6295689-39f2-0310-b995-f0e70906c6a9
2008-12-05 15:48:49 +00:00
ludovic.rousseau
6f3012d959
add CKM_SHA256* and CKM_SHA384* logs
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3596 c6295689-39f2-0310-b995-f0e70906c6a9
2008-11-27 10:44:57 +00:00
martin
1e41d4d267
* Fix issues with pkcs11-tool testing of C_GenerateRandom/C_SeedRandom and OpenSC PKCS#11 implementation of those functions.
...
Thanks goes to Rickard Bondesson who noticed the issues.
http://www.opensc-project.org/pipermail/opensc-devel/2008-November/011436.html
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3595 c6295689-39f2-0310-b995-f0e70906c6a9
2008-11-24 22:06:27 +00:00
martin
36112bf6e0
typos
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3594 c6295689-39f2-0310-b995-f0e70906c6a9
2008-11-24 21:55:28 +00:00
martin
7b93c51230
Missing SHAs
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3593 c6295689-39f2-0310-b995-f0e70906c6a9
2008-11-24 21:53:56 +00:00
martin
04b30cdac3
Add --list-token-slots / -T to pkcs11-tool to list only slots with tokens.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3592 c6295689-39f2-0310-b995-f0e70906c6a9
2008-11-21 22:34:31 +00:00
alonbl
bb6f6f7952
mingw32->mingw*
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3591 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-27 19:17:36 +00:00
alonbl
d7941bf850
Re-add pcsc-lite compile-time dependency
...
Win64 changed the SCARDCONTEXT from LONG to ULONG_PTR,
pcsc-lite did not follow this on 64bit platforms.
This breaks the pcsc module.
To solve this we use installed winscard.h in order to get proper
declerations.
As mingw32 does not have winscard.h we keep current types. mingw64 and
pcsc-lite system have winscard.h.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3590 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-27 19:16:28 +00:00
alonbl
4ad85b3d91
Add some more debug information to pcsc
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3589 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-26 19:13:14 +00:00
alonbl
d771870d5c
Resolve some conflict with win64
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3588 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-26 14:48:47 +00:00
ludovic.rousseau
d2f428590b
use 0x%08lx instead of 0x08%lx
...
Thanks to Alon Bar-Lev for the patch
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3587 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-20 15:04:29 +00:00
ludovic.rousseau
4a1e1192a6
display PC/SC error codes as 0x08%lx instead of %lx to make it explicit
...
they are hex values
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3586 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-20 07:46:24 +00:00
ludovic.rousseau
b4c5c8d539
use SCARD_S_SUCCESS instead of 0
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3585 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-20 07:27:41 +00:00
ludovic.rousseau
1e5cd2466e
Add documentation:
...
# (max_virtual_slots/num_slots) limits the number of readers
# that can be used on the system. Default is then 8/4=2 readers.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3584 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-10 09:42:36 +00:00
ludovic.rousseau
6b89748111
slot_get_token(): return CKR_TOKEN_NOT_PRESENT if CKF_TOKEN_PRESENT is
...
not set.
Thanks to Douglas E. Engert for the patch
http://www.opensc-project.org/pipermail/opensc-devel/2008-October/011361.html
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3583 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-10 09:39:27 +00:00
ludovic.rousseau
001f03f18d
card_removed(): warning: comparison between signed and unsigned
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3582 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-09 13:05:13 +00:00
ludovic.rousseau
6eb3ecd107
card_initialize(): correctly associate a reader to each virtual slot.
...
Thanks to Douglas E. Engert for the patch
http://www.opensc-project.org/pipermail/opensc-devel/2008-October/011359.html
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3581 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-09 12:59:02 +00:00
ludovic.rousseau
e2b329e7c9
make the * targets depend on only one dependency to avoid problems on
...
concurrent make (-j)
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3580 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-09 09:02:42 +00:00
ludovic.rousseau
ac8bb831c4
remove html.out and man.out before filling them to avoid problems
...
when/if they already contain a html.tmp or man.tmp file (on the 3rd
execution of make)
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3579 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-09 08:35:32 +00:00
ludovic.rousseau
f640522270
cardos-info is now cardos-tool
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3578 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-09 08:32:14 +00:00
alonbl
df74ebcdc0
Handle spaces correctly
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3577 c6295689-39f2-0310-b995-f0e70906c6a9
2008-10-04 19:52:56 +00:00