Commit Graph

220 Commits

Author SHA1 Message Date
martin 1139181493 * fix an return code from ctbcs spec
* make sure pins and puk are correctly associated in esteid emu


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2277 c6295689-39f2-0310-b995-f0e70906c6a9
2005-03-24 16:54:10 +00:00
aj f5b2845340 silence a few warnings.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2274 c6295689-39f2-0310-b995-f0e70906c6a9
2005-03-23 23:24:13 +00:00
pisi 295fe6138d Introduce TeleTrust Class 2 spec compliant pinpad functionality and
incorporate the pinpad functions directly to reader-pcsc.c. Mainly because
the code requires access to internal pcsc-only structures and splitting
some definitions to an extra header would not be very nice. Also, the API
is pcsc based and usable with other ifdhandlers too, not just CCID.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2238 c6295689-39f2-0310-b995-f0e70906c6a9
2005-03-09 12:44:31 +00:00
bert 2d97002824 API fixup: use defined type instead of struct for exposed structs
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2232 c6295689-39f2-0310-b995-f0e70906c6a9
2005-03-08 20:59:35 +00:00
pisi 1463b324b3 consistent naming and trimmed lines
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2229 c6295689-39f2-0310-b995-f0e70906c6a9
2005-03-04 01:41:39 +00:00
aet 8a8f2cd6bc - Introduce a new powerful card_atr mechanism to opensc
configuration file to handle any configuring related
  to certain card / cards using atrmask.
- Rewrite Martin's force_protocol to _sc_check_forced_protocol()
  to make it possible to share the code with other reader driver
  implementations than pcsc.
- Implement _sc_match_atr_block() to help out with force protocol
  and pkcs15 emulation layers, to find information that's not
  stored directly to sc_atr_table.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2192 c6295689-39f2-0310-b995-f0e70906c6a9
2005-02-22 07:59:42 +00:00
aet 0b773d6612 - Cleanup
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2154 c6295689-39f2-0310-b995-f0e70906c6a9
2005-02-07 11:40:58 +00:00
aet 986724c1ad - Build fix
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2110 c6295689-39f2-0310-b995-f0e70906c6a9
2005-01-29 10:44:07 +00:00
sth 7ea47a2bba Windows fix: SCARD_CTL_CODE is already #defined in a Windows header
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2105 c6295689-39f2-0310-b995-f0e70906c6a9
2005-01-28 20:39:47 +00:00
aet 622607a68c - Build fix
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2102 c6295689-39f2-0310-b995-f0e70906c6a9
2005-01-25 11:45:47 +00:00
aet 5a5c6d165e - Add use_ccid_pin_cmd boolean to opensc.conf, for now.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2101 c6295689-39f2-0310-b995-f0e70906c6a9
2005-01-25 11:11:13 +00:00
aet 8182177a00 - Early ccid pinpad cleanups, more to follow
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2098 c6295689-39f2-0310-b995-f0e70906c6a9
2005-01-24 18:30:55 +00:00
nils 3158fa3e05 merge Martin Paljak's ccid pinpad changes from the OPENSC_0_9 branch to the cvs head
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2095 c6295689-39f2-0310-b995-f0e70906c6a9
2005-01-24 11:31:11 +00:00
nils 8a0fc5bdcf fix indent, patch supplied by Martin Paljak
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2082 c6295689-39f2-0310-b995-f0e70906c6a9
2005-01-19 16:17:32 +00:00
nils 8446dc7cec fix compiler warnings
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2031 c6295689-39f2-0310-b995-f0e70906c6a9
2004-12-21 13:22:10 +00:00
nils bea5746094 remove superfluous code, Martin Paljak <martin@paljak.pri.ee>
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2030 c6295689-39f2-0310-b995-f0e70906c6a9
2004-12-21 11:03:57 +00:00
nils 3d75aeeaff force_protocol cleanup from Martin Paljak <martin@paljak.pri.ee>
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2029 c6295689-39f2-0310-b995-f0e70906c6a9
2004-12-21 09:54:47 +00:00
nils 2df8086209 fix definition of SCARD_PROTOCOL_ANY
patch supplied by Ludovic Rousseau <ludovic.rousseau@free.fr>


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1898 c6295689-39f2-0310-b995-f0e70906c6a9
2004-08-31 17:31:00 +00:00
nils d6c98f7ae2 add support to force pcsc to use a certain protocol
patch supplied by Martin Paljak <martin@paljak.pri.ee>


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1890 c6295689-39f2-0310-b995-f0e70906c6a9
2004-08-19 08:55:15 +00:00
aj c9dfe962b9 Deal with new pcsc-lite code changes.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1845 c6295689-39f2-0310-b995-f0e70906c6a9
2004-07-20 20:52:21 +00:00
sth cdee73adff Fix: don't free anything in the connect() function because it can be called multiple times
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1816 c6295689-39f2-0310-b995-f0e70906c6a9
2004-07-09 15:31:08 +00:00
nils 475a29de67 proper checking of the SCardListReaders return values
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1780 c6295689-39f2-0310-b995-f0e70906c6a9
2004-04-27 17:41:02 +00:00
okir 5dda541b7e - made apdu_masquerade functionality available to all readers, not just pcsc
- added new parameters max_send_size and max_recv_size, roughly corresponding
  to the old max_le (SC_APDU_CHOP_SIZE) parameter. You can now set this
  chop limit per driver class (pcsc, openct, ctapi), which sets
  driver->max_{send,recv}_size. This value is copied to
  card->max_{send,recv}_size in sc_connect_card, and can be overridden
  by the card driver.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1683 c6295689-39f2-0310-b995-f0e70906c6a9
2003-12-18 16:35:28 +00:00
aet d6713aff9a - Minor naming convention harmonisation for pc/sc and ct-api
related things


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1669 c6295689-39f2-0310-b995-f0e70906c6a9
2003-12-10 14:52:58 +00:00
aet 0cddfbaf46 - Warning fix
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1631 c6295689-39f2-0310-b995-f0e70906c6a9
2003-11-20 20:46:15 +00:00
sth 3b746f0b5e Add room for SW1-SW2 in case of maximum reply size (256 bytes)
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1604 c6295689-39f2-0310-b995-f0e70906c6a9
2003-11-14 10:14:54 +00:00
okir c85357baf9 - remain backward compatible - apdu_masq patch shouldn't break existing
config files that use apdu_fix


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1598 c6295689-39f2-0310-b995-f0e70906c6a9
2003-11-03 10:20:02 +00:00
okir 8e1443071c - merged apdu_masq patch from Chaskiel Grundman
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1597 c6295689-39f2-0310-b995-f0e70906c6a9
2003-11-03 10:16:25 +00:00
aet fe9eac7ad2 Rename HAVE_PCSCLITE to HAVE_PCSC, which is more correct.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1467 c6295689-39f2-0310-b995-f0e70906c6a9
2003-09-26 08:15:15 +00:00
aet e66bb1ef16 Remove gcc specific code from usbtoken/openct drivers, untested.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1417 c6295689-39f2-0310-b995-f0e70906c6a9
2003-09-04 16:41:49 +00:00
aet 5616dba08e - Stop using unflexible automake conditionals when
building PC/SC, OpenCT or USBToken support,
  use ifdef's directly in source.
- Because of above, add HAVE_PCSCLITE for winconfig.h
- Remove unnecessary includes for log.h, opensc.h and
  errors.h in libopensc sources, they're already taken
  care by internal.h.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1406 c6295689-39f2-0310-b995-f0e70906c6a9
2003-09-03 09:28:55 +00:00
aet 763fc16704 Rename libopensc specific error/debug to sc_error/sc_debug
We should have done this ages ago.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1392 c6295689-39f2-0310-b995-f0e70906c6a9
2003-08-25 14:21:18 +00:00
aet 40f995994a Add support for MacOS X with PC/SC framework using autoconfigure.
Tested using Panther (WWDC build) + fink. Should work without fink, too.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1307 c6295689-39f2-0310-b995-f0e70906c6a9
2003-07-28 10:02:23 +00:00
aet 4de1bef042 - Build fixes
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1301 c6295689-39f2-0310-b995-f0e70906c6a9
2003-07-24 13:10:53 +00:00
okir 127f94ad37 - added pinpad support for OpenCT
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1215 c6295689-39f2-0310-b995-f0e70906c6a9
2003-06-23 12:56:36 +00:00
okir 3ed0c2f5b1 - do not mess with Case 4 APDUs unless we're doing T=0
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1105 c6295689-39f2-0310-b995-f0e70906c6a9
2003-05-14 12:00:57 +00:00
sth a02b233a6c Correction of the previous insert-remove fix
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1060 c6295689-39f2-0310-b995-f0e70906c6a9
2003-04-22 07:51:45 +00:00
sth b531527169 More robust detection of removal/insertion events
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1044 c6295689-39f2-0310-b995-f0e70906c6a9
2003-04-17 14:35:58 +00:00
okir f8a7fecf78 - get rid of warning
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1026 c6295689-39f2-0310-b995-f0e70906c6a9
2003-04-16 15:56:40 +00:00
sth 7cb9901113 Correction of the previous patch for MacOSX
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1018 c6295689-39f2-0310-b995-f0e70906c6a9
2003-04-16 12:01:08 +00:00
sth 4545fc2ab6 include for MacOSX added
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1011 c6295689-39f2-0310-b995-f0e70906c6a9
2003-04-15 15:59:32 +00:00
okir 340aad07a0 - fixes for le=00/lc=00 problems
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@982 c6295689-39f2-0310-b995-f0e70906c6a9
2003-04-10 09:16:05 +00:00
sth 4aef09109b card remove/insert dection for Win32
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@953 c6295689-39f2-0310-b995-f0e70906c6a9
2003-03-20 12:52:39 +00:00
okir aab6ebd1e7 - minor cosmetic change
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@946 c6295689-39f2-0310-b995-f0e70906c6a9
2003-03-10 21:23:08 +00:00
sth 57954682fd added error: unresponsive card
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@915 c6295689-39f2-0310-b995-f0e70906c6a9
2003-02-19 13:36:58 +00:00
sth 0b9c44172d get the right error code on card removal
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@906 c6295689-39f2-0310-b995-f0e70906c6a9
2003-02-12 14:20:00 +00:00
sth 7d6837321f Fixes for Windows, who's PC/SC has more events that interfere with insert/removal events
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@882 c6295689-39f2-0310-b995-f0e70906c6a9
2003-01-27 13:01:17 +00:00
okir 5b1eb43b93 - add some support for card removal in pkcs11
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@867 c6295689-39f2-0310-b995-f0e70906c6a9
2003-01-19 17:47:07 +00:00
okir 8229351cce - DEF_APDU_FIX wasn't used unless you install a config file.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@838 c6295689-39f2-0310-b995-f0e70906c6a9
2003-01-06 17:45:06 +00:00
okir 9b330f3408 - vertain platforms need time.h to understand time_t
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@833 c6295689-39f2-0310-b995-f0e70906c6a9
2003-01-05 18:06:35 +00:00
okir 04c00ef5ef - fixed problem with infinite tiemout in sc_wait_for_event
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@831 c6295689-39f2-0310-b995-f0e70906c6a9
2003-01-05 17:59:24 +00:00
okir 21fe5ef918 - Patch from Stef to implement sc_wait_for_event, slightly enhanced by
yours truly.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@825 c6295689-39f2-0310-b995-f0e70906c6a9
2003-01-03 16:32:06 +00:00
okir 675ef65073 - default apdu_fix=1 on win32
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@821 c6295689-39f2-0310-b995-f0e70906c6a9
2003-01-03 13:27:19 +00:00
okir 93c0cab7b9 - win32 fixes from stef
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@814 c6295689-39f2-0310-b995-f0e70906c6a9
2003-01-02 15:31:53 +00:00
okir 9acca0e724 - Implemented new PIN verify/change/unblock framework. All PIN operations
are routed through sc_pin_cmd(), which builds the APDU and either passes
  it to the card directly, or to the card reader along with a request to
  read the PIN(s) from the reader's keypad.

  Currently, entering PIN in the standard way (i.e. via the application)
  should still work - I have verified GPK and eToken; Cryptoflex verify
  should work as well. Anything else needs additional testing, and support
  for keypad input in particular (I cannot test this at the moment for
  lack of a suitable reader).


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@811 c6295689-39f2-0310-b995-f0e70906c6a9
2002-12-23 18:47:27 +00:00
okir 6217b4adf5 - changed pcsc_detect_card_presence to call refresh_slot_attributes. This
eliminates duplicate code, and that we also pick up the new ATR if another
  card was inserted in the meanwhil.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@758 c6295689-39f2-0310-b995-f0e70906c6a9
2002-12-06 21:40:41 +00:00
aet 1d2c9e4c48 Cleanups for initial win32 port, untested.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@696 c6295689-39f2-0310-b995-f0e70906c6a9
2002-10-19 14:04:52 +00:00
fabled 7635468ed9 - Initial support for win32
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@654 c6295689-39f2-0310-b995-f0e70906c6a9
2002-06-14 12:52:56 +00:00
jey a94d1b26fb - Fix for last commit. It now compiles, at least.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@650 c6295689-39f2-0310-b995-f0e70906c6a9
2002-06-14 11:43:22 +00:00
jey ed19095c71 - Preliminary fix for Case 4 APDU sending on Win32
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@649 c6295689-39f2-0310-b995-f0e70906c6a9
2002-06-14 11:33:20 +00:00
aet 2846d6ce3b Preliminary MacOS X build support, untested so far.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@617 c6295689-39f2-0310-b995-f0e70906c6a9
2002-06-03 15:18:47 +00:00
aet 3dccd63989 - C++ support. Compiles with gcc/g++ for Linux, otherwise
completely untested.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@574 c6295689-39f2-0310-b995-f0e70906c6a9
2002-04-19 14:23:31 +00:00
jey 6e0b7dea2c - Divided errors into different groups, added new ones
and renamed some
- Moved sc_strerror() to errors.c
- Added a 'sensitive' flag to struct sc_apdu


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@479 c6295689-39f2-0310-b995-f0e70906c6a9
2002-04-06 12:02:28 +00:00
jey 22636c2df9 - Added SC_ERROR_FILE_ALREADY_EXISTS
- Changed call convention for reader finish()
- CT-API driver now frees its resources correctly
- Added year 2002 to some of the copyright statements
- sc_pkcs15_decipher() and sc_pkcs15_compute_signature()
  now select only the parent DF of the private key file


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@463 c6295689-39f2-0310-b995-f0e70906c6a9
2002-04-05 14:46:44 +00:00
aet d81d10ba90 Upgrade sources to use new headers, part #1
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@458 c6295689-39f2-0310-b995-f0e70906c6a9
2002-04-05 10:44:51 +00:00
jey 59d4e9b7be - Added support for CT-API
- Improved config file loading
- Implemented ATR parsing


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@396 c6295689-39f2-0310-b995-f0e70906c6a9
2002-03-26 11:38:40 +00:00
jey cd4e3650a4 - Moved functions from sc.c to ctx.c
- Card and reader drivers are now configurable


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@387 c6295689-39f2-0310-b995-f0e70906c6a9
2002-03-24 22:47:35 +00:00
aet e605e6fa8b Fix segfault for pcsc_finish
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@224 c6295689-39f2-0310-b995-f0e70906c6a9
2002-02-24 21:14:17 +00:00
aet 412292eab1 Add missing SC_STATUS_TIMEOUT that was removed from sc-internal.h
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@223 c6295689-39f2-0310-b995-f0e70906c6a9
2002-02-24 20:16:07 +00:00
jey 3fa1b27736 - implemented reader abstraction layer; now it's easier to
add support for e.g. CT-API
- renamed ops_data field to drv_data in struct sc_card
- copied coding style document from Linux kernel


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@221 c6295689-39f2-0310-b995-f0e70906c6a9
2002-02-24 19:32:14 +00:00