Peter Marschall
a0ca6b2ef0
OpenPGP: set card's version in pgp_init()
2015-10-15 16:43:10 +02:00
Peter Marschall
7078fbd505
OpenPGP: cleanup pgp_init()
...
- use LOG_FUNC_RETURN instead of return for symmetry with LOG_FUNC_CALLED
2015-10-15 16:43:10 +02:00
Peter Marschall
e1db96b73b
OpenPGP: extend pgp_match_card()
...
- explicitly check for supported versions
- log successful matches by AID with their type
- log detection of unsupported OpenPGP-type cards
2015-10-15 16:43:09 +02:00
Peter Marschall
7c2adb1fc8
OpenPGP: 1st preparations for newer versions
...
- add references to new specs
- add new enum _version constants
2015-10-15 16:43:09 +02:00
Peter Marschall
69b482dce6
OpenPGP: cleanup pgp_get_card_features()
...
- bug fix: re-initialize index to start searching at the right place
- get rid of unnecessary variable
- add some line breaks & comemnts for easier understanding
2015-10-15 16:42:58 +02:00
Peter Marschall
2a269c5267
OpenPGP: cleanup pgp_build_tlv()
...
- get rid of intermediate variable
- clarify check in while() loop
- line breaks for easier reading
2015-10-15 16:17:22 +02:00
Peter Marschall
3d492ae376
OpenPGP: cleanup pgp_erase_card()
...
- get rid of unnecessary variable
- use easily understandable hex representation of APDUs
- auto-calculate APDU length based on hex representation
- restrict scope of some variables
- use sc_log() instead of directly writing to console
- line breaks & comments for easier reading/understanding
- fix typo in log message
2015-10-15 16:17:22 +02:00
Peter Marschall
3d4fbd776d
OpenPGP: harmonize coding style
...
- 2 line breaks between functions for easier reading
- function type on separate line
- mark each function as 'ABI' or 'Internal'
- slightly doxygen-ize comments introducing functions
- fix typos in comments
- break over-long comment lines
- break comment lines at sensible places
- consistent calling style for DRVDATA()
- no code change
2015-10-15 16:17:22 +02:00
Peter Marschall
7ba47fd5a9
OpenPGP: consistently use card->ctx in pgp_put_data_plain()
...
- get rid of unnecessary variable
- harmonize coding style: adapt to prevailing use of card->ctx
2015-10-15 16:17:22 +02:00
Peter Marschall
1a05f968bd
OpenPGP: simplify gnuk_write_certificate()
...
- get rid of unnecessary variables
- use for-loop to initialize/check/increase run variable in one place
- restrict variables to the necessary scope
- use ternary operator inside a statement instead of if...else...
2015-10-15 16:17:22 +02:00
Peter Marschall
d2b1c8228f
OpenPGP: set apdu_case on declaration
...
- use ternary operator to set apdu_case immediately on declaration
for the GNUK and non-GNUK case
2015-10-15 16:17:22 +02:00
Peter Marschall
3341c5bb8f
OpenPGP: make logical structure clearer
...
- one line per sub-term in the condition of the conditional statement
2015-10-15 16:17:11 +02:00
Frank Morgner
e316bf3140
Merge pull request #582 from marschap/openpgp-tool-fixes
...
Openpgp tool fixes
2015-10-15 13:13:18 +02:00
Frank Morgner
71aa6bbced
Merge pull request #581 from marschap/piv-doc-fixes
...
piv: fix typos in usage & man page
2015-10-15 13:09:56 +02:00
Peter Marschall
6498721076
piv: fix typos in usage & man page
2015-10-15 12:51:19 +02:00
Peter Marschall
7de373b3b9
OpenPGP: mark do_erase as an action in openpgp-tool
...
- avoid the unintended output of user info when only erasing was requested
2015-10-15 12:51:10 +02:00
Peter Marschall
524ad56146
OpenPGP: remove unnecessary semicolons in openpgp-tool
...
- this is C, not a shell script
2015-10-15 12:51:10 +02:00
Peter Marschall
392bc08d86
OpenPGP: fix pretty name for gender code 39 in openpgp-tool
...
- use the same term that GnuPG uses
2015-10-15 12:51:10 +02:00
Peter Marschall
e79f1f4b01
OpenPGP: accept -E as option in openpgp-tool
...
- make behaviour match the usage message by accepting '-E' as
alternative short form of '--erase'
2015-10-15 12:51:10 +02:00
Frank Morgner
851e0a24ff
Merge pull request #571 from frankmorgner/label
...
Fixes accessing fixed size arrays
2015-10-14 18:56:29 +02:00
Frank Morgner
ee5915700c
Merge pull request #516 from frankmorgner/lock
...
Only re-lock for Windows and Apple
2015-10-13 14:11:29 +02:00
Frank Morgner
a912004a7f
Merge pull request #574 from dengert/piv-cac
...
Partial fix for #570 . Select AID for PIV
2015-10-12 17:28:42 +02:00
Doug Engert
0b268f789a
Allow PIV driver to use cards where default application in not PIV
...
card-piv.c was not selecting the PIV AID correctly from piv_find_aid.
This cause a CAC card that also has the PIV application to fail a VERIFY command
of the pin would use a VERIFY APDU P2 where P2 for PIV is 80, but for CAC was 00.
A CAC card could work if the caller requested the serial number of the card
which did call piv_select_aid. All the OpenSC tools, minidriver and
PKCS#11 do this, but Tokend does not.
This is a partial fix for https://github.com/OpenSC/OpenSC/issues/570 .
Tokend in later MacOS versions still has other issues.
A more complete solution is needed for cards with multiple applications.
I do not have a CAC card or MAC to do any testing.
Thanks to https://github.com/mouse07410 who has a CAC card, and a Mac,
and has tested this fix.
2015-10-11 19:14:02 -05:00
Frank Morgner
da1d4cc78a
Fix locking issue on OS X
...
Works around Apple shipping PCSC-Lite headers without PCSC-Lite. Let's
say they do it for "backward compatibility"...
2015-10-08 08:24:40 +02:00
Frank Morgner
a6b36507a3
removed unused parent in md directory/file
2015-10-06 22:49:32 +02:00
Frank Morgner
d18ddcb446
fixed accessing fixed size md file/directory name
2015-10-06 22:49:16 +02:00
Frank Morgner
6c61bf6815
fixed accessing fixed size guid
2015-10-06 22:49:16 +02:00
Ludovic Rousseau
5dd806815d
Merge pull request #572 from okirch/email-fixup-olaf
...
Update outdated address okir@lst.de -> okir@suse.de
2015-10-05 21:15:33 +02:00
Olaf Kirch
f42a1c2563
Replace outdated address okir@lst.de -> okir@suse.de
...
Signed-off-by: Olaf Kirch <okir@suse.de>
2015-10-05 14:07:28 +02:00
Frank Morgner
137afb10b7
Check for NUL in label to test its presence
2015-10-05 08:30:47 +02:00
Frank Morgner
5b0332528f
fixed accessing app_label in sc_pkcs15_data_info_t
2015-10-05 08:23:02 +02:00
Frank Morgner
f9cd1fc476
fixed accessing fixed size cvc members
2015-10-04 17:53:51 +02:00
Frank Morgner
161e84f066
pkcs15-tool.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
Frank Morgner
35f028a57c
pkcs15-init.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
Frank Morgner
d709347c2b
pkcs15-crypt.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
Frank Morgner
191af692c8
print.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
Frank Morgner
e171789dad
pintest.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
Frank Morgner
7c1feb1b8a
pkcs15-oberthur.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
Frank Morgner
fa3f4d632c
pkcs15-lib.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
Frank Morgner
1046d951ba
framework-pkcs15.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
Frank Morgner
c56fe19b31
minidriver.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
Frank Morgner
b7f794ae48
AppVeyor: build with zlib on 32 bit only
2015-10-04 14:04:57 +02:00
Frank Morgner
64417c271e
fixed out of bounds access
2015-10-04 13:19:29 +02:00
Frank Morgner
78018a2b49
fixed string operation on fixed size array
2015-10-04 13:07:39 +02:00
Frank Morgner
d33517a58b
fixed missing comma
2015-10-04 12:55:25 +02:00
Frank Morgner
9e500e0b9a
fixed bad typecast
2015-10-04 12:52:49 +02:00
Frank Morgner
50e81d1de0
added missing break
2015-10-04 12:45:25 +02:00
Frank Morgner
ac65af0669
Fixes unreleased locks with pcsc-lite
...
This is a bug in PCSC-Lite propably won't be fixed, see
https://alioth.debian.org/tracker/index.php?func=detail&aid=315083&group_id=30105&atid=410088
Fixes https://github.com/OpenSC/OpenSC/issues/480
Closes https://github.com/OpenSC/OpenSC/pull/487
2015-10-03 12:55:15 +02:00
Frank Morgner
5e242c5fb2
Merge pull request #560 from CardContact/fix_sc_pkcs15init_finalize_profile
...
Removed error check to support card with PKCS#15 emulation but no mat…
2015-10-02 15:18:14 +02:00
Frank Morgner
a15363198c
Merge pull request #569 from mdealencar/patch-2
...
fix: change SC_TERMINATE (undefined) to SC_CTX_FLAG_TERMINATE
2015-10-02 15:16:42 +02:00