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
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
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
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
e316bf3140
Merge pull request #582 from marschap/openpgp-tool-fixes
...
Openpgp tool fixes
2015-10-15 13:13:18 +02:00
6498721076
piv: fix typos in usage & man page
2015-10-15 12:51:19 +02:00
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
524ad56146
OpenPGP: remove unnecessary semicolons in openpgp-tool
...
- this is C, not a shell script
2015-10-15 12:51:10 +02:00
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
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
e1073c09ea
handle checking of file output in sc_select_file
...
fixes https://github.com/OpenSC/OpenSC/issues/576
2015-10-14 23:25:13 +02:00
bcf9b2bc84
added error checking
2015-10-14 23:14:47 +02:00
e634169a92
added error checking
2015-10-14 23:14:47 +02:00
c371c3b5ec
removed unused variable
2015-10-14 23:08:39 +02:00
f9011b7dc0
fixed indenting
2015-10-14 22:57:10 +02:00
4f13fde7f1
use size_t for a length instead of int
2015-10-14 22:56:53 +02:00
4275dac495
fixed indenting
2015-10-14 22:51:55 +02:00
0bf1f3755c
removed unused variable
2015-10-14 22:48:45 +02:00
fed64b0636
minidriver: fixes according to Frank's comments
2015-10-14 22:48:41 +02:00
949d8614d2
removed unused variable
2015-10-14 22:46:55 +02:00
0258c91f30
removed unused variable
2015-10-14 22:43:12 +02:00
0a96616034
remove unused variable
2015-10-14 22:38:10 +02:00
6573a93d4b
fixed memory leak
2015-10-14 22:37:56 +02:00
a5685b537e
fixed memory leak
2015-10-14 22:34:44 +02:00
15f204c5d6
fixed indenting
2015-10-14 22:32:51 +02:00
895005f4df
added error checking
2015-10-14 22:28:49 +02:00
65bc754b8b
Do not expose access to PIV emulated files from utilities
...
PIV cards uses get/put data not select file and read_binary.
To allow access via pkcs15 emulation card-piv.c emulates
select_file and read_binary but only when used with the path as
created by the piv emulation.
There are no MF.DIR or ED.DIR files.
opensc-tool and opensc-explorer will not work with this emulation.
Patch removes code that caused problems with opensc-tooland opensc-explorer.
2015-10-14 15:27:58 -05:00
00daa3f535
added error checking
2015-10-14 22:27:32 +02:00
9a82ddea8a
fixed memory leak
2015-10-14 22:26:53 +02:00
75d76f5ce4
Merge branch 'master' of https://github.com/OpenSC/OpenSC into OpenSC-master
...
Conflicts:
src/minidriver/minidriver.c
2015-10-14 22:22:19 +02:00
5558b9d368
removed unused parameters
2015-10-14 22:17:33 +02:00
2ed4c8ae6c
Adds error checking
2015-10-14 22:16:44 +02:00
94772c870a
Adds error checking
2015-10-14 22:15:17 +02:00
c9420046c5
Removed unused parameter
2015-10-14 22:08:14 +02:00
77b5138860
Removed unused parameter
2015-10-14 22:02:35 +02:00
851e0a24ff
Merge pull request #571 from frankmorgner/label
...
Fixes accessing fixed size arrays
2015-10-14 18:56:29 +02:00
ee5915700c
Merge pull request #516 from frankmorgner/lock
...
Only re-lock for Windows and Apple
2015-10-13 14:11:29 +02:00
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
747678c83d
minidriver: remove unnecessary logs on console (certutil -scinfo)
2015-10-11 18:51:36 +02:00
b968fcfb1f
minidriver: Windows x509 enrollment works
...
Removed cmap_record in sc_pkcs15_prkey_info (not used by any driver nor code)
Remove cardcf specific code (cardcf neutralized by CP_CACHE_MODE_NO_CACHE and it maintened by the Base CSP/KSP, not the minidriver)
Add conversion code for Windows GUID / OpenSC self computed GUID
2015-10-11 15:20:04 +02:00
bee1a450c9
minidriver: modified configuration functions
2015-10-11 10:39:02 +02:00
7551baafbd
minidriver: add crt secure functions (*_s)
2015-10-10 22:07:49 +02:00
ebfb76d311
minidriver: fix library import for guid & one compilation warning
2015-10-10 19:01:14 +02:00
8f4420cb78
minidriver: factorize container naming code
2015-10-10 15:39:27 +02:00
227f48d7b0
minidriver: replace one sprintf by sprintf_s
2015-10-10 14:15:23 +02:00
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
a6b36507a3
removed unused parent in md directory/file
2015-10-06 22:49:32 +02:00
d18ddcb446
fixed accessing fixed size md file/directory name
2015-10-06 22:49:16 +02:00
6c61bf6815
fixed accessing fixed size guid
2015-10-06 22:49:16 +02:00
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
137afb10b7
Check for NUL in label to test its presence
2015-10-05 08:30:47 +02:00
5b0332528f
fixed accessing app_label in sc_pkcs15_data_info_t
2015-10-05 08:23:02 +02:00
811a86e72a
fix: set the container name as the id if md_guid_as_label is set
2015-10-04 19:49:31 +02:00
f9cd1fc476
fixed accessing fixed size cvc members
2015-10-04 17:53:51 +02:00
161e84f066
pkcs15-tool.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
35f028a57c
pkcs15-init.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
d709347c2b
pkcs15-crypt.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
191af692c8
print.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
e171789dad
pintest.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
7c1feb1b8a
pkcs15-oberthur.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
fa3f4d632c
pkcs15-lib.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
1046d951ba
framework-pkcs15.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
c56fe19b31
minidriver.c: fixed accessing label in sc_pkcs15_object_t
2015-10-04 17:33:14 +02:00
64417c271e
fixed out of bounds access
2015-10-04 13:19:29 +02:00
78018a2b49
fixed string operation on fixed size array
2015-10-04 13:07:39 +02:00
d33517a58b
fixed missing comma
2015-10-04 12:55:25 +02:00
9e500e0b9a
fixed bad typecast
2015-10-04 12:52:49 +02:00
50e81d1de0
added missing break
2015-10-04 12:45:25 +02:00
3edf32ca9c
fix: when exporting immediatly an ECC key when the ECC key just has been created
...
This test case is triggered when requesting a ECC certificate from ADCS:
NCryptCreatePersistedKey followed by NCryptExportKey
2015-10-03 19:41:34 +02:00
c3f2cb142f
fix "use guid as label"
...
Allow to use as pkcs15 label the windows container name (max: 39 characters)
2015-10-03 18:59:52 +02:00
b667645797
fix compilation warning
2015-10-03 18:56:19 +02:00
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
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
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
4f4643ee3e
Merge pull request #452 from frankmorgner/memory-leaks
...
Fix some memory leaks
2015-10-02 15:13:34 +02:00
e0a4e0bfec
Merge pull request #532 from frankmorgner/sloppy
...
implemented sloppy initialization for C_GetSlotInfo
2015-10-02 15:13:07 +02:00
f851197129
Merge pull request #565 from frankmorgner/sm-openssl
...
Build a lightweight version of OpenSC
2015-10-02 15:12:41 +02:00
34d6c10fa0
fix: change SC_TERMINATE (undefined) to SC_CTX_FLAG_TERMINATE
...
This file was not compiling because SC_TERMINATE is not defined anywhere. It seems like the intended expression is what I propose.
2015-10-01 08:38:23 -03:00
f252277fab
Add configuration for sloppy PKCS#11 initialization
2015-10-01 12:44:41 +02:00
3307dd6f45
implemented sloppy initialization for C_GetSlotInfo
...
Makes things work for Java and closes #523
2015-10-01 12:44:41 +02:00
a9897f9956
First implementation of CardDeleteContainer
...
Container now can be created, deleted, in short, a read write card
2015-09-30 22:52:37 +02:00
67740fb955
quality improvement of CardDeriveKey
2015-09-30 22:49:41 +02:00
9a590d64e4
do not reset the authentication state before each operation
2015-09-30 22:47:16 +02:00
c5cf4f69a2
Merge pull request #559 from philipWendland/ecc-sig-format
...
ECDSA helper functions: strip zeroes when converting from R,S to sequence
2015-09-30 08:14:25 +02:00
fb705b6a2d
Merge pull request #563 from CardContact/fix_reselect_applet_for_pin_verification
...
Fix reselect applet for pin verification
2015-09-29 20:09:00 +02:00
c00f9830ba
force recompilation on integration plateforms
2015-09-25 22:56:26 +02:00
701d45e89d
fix delay load library import
2015-09-25 22:30:11 +02:00
6cbeea3942
First ECC support for the minidriver
2015-09-25 22:22:29 +02:00
83a28a1bc3
pkcs15: Observe path.aid for PIN operation
2015-09-25 11:56:32 +02:00
7fd4edf7b6
Allow cards without EF.DIR using default application
...
Removed error check to support card with PKCS#15 emulation but no matching card app
2015-09-25 11:43:01 +02:00
7120a9b549
Merge pull request #554 from frankmorgner/fixes
...
Some more fixes for problems reported by Coverity scan
2015-09-25 11:13:17 +02:00
30c90448fb
Adds missing Advapi32.lib to opensc_a.lib
2015-09-25 10:58:53 +02:00
d8d47bb06f
sc-hsm: Bind PIN object to applet aid to ensure SELECT before PIN verification
2015-09-23 15:38:57 +02:00
c41153aa13
pkcs15: Select application defined by path.aid for PIN verification
2015-09-23 15:36:56 +02:00
e14e028453
Properly describe OpenSSL dependencies in .mak files
2015-09-23 08:23:28 +02:00
ffd85adae7
Decouples SM from OpenSSL
2015-09-24 14:46:30 +02:00
4814863d18
Merge pull request #551 from frankmorgner/507
...
Fix OpenPGP driver to work correctly with YubiKey NEO
2015-09-21 13:23:18 +02:00
328176d28b
ECDSA helper functions: strip zeroes when converting from R,S to sequence
...
For ECDSA signatures, there are multiple ways to format the signature:
- R|S (R and S filled with zeroes at the most significant bytes)
- ASN1 sequence of R,S integers (e.g. used by OpenSSL).
It is rare that the filling with zeroes is needed.
But if it is, in the second case, the filling zeroes should not be there
or the verification of the signature by OpenSSL will fail.
2015-09-20 22:34:39 +02:00
09fb1e71a9
IsoApplet: add PIN to pincache upon creation
2015-09-18 17:02:45 +02:00
6bffeb7a36
IsoApplet: fix dead code
2015-09-18 17:02:45 +02:00
24a3999386
Fix indentation for readability
2015-09-17 19:03:44 -05:00
c399bc94ec
piv-tool: fixed resource leak
2015-09-17 22:32:07 +02:00
2dca6ced06
pkcs15-oberthur: fixed resource leak
2015-09-17 22:32:07 +02:00
4e280b4741
pkcs15-lib: fixed resource leak
2015-09-17 22:32:07 +02:00
5854aff155
pkcs15-epass2003: fixed resource leak
2015-09-17 22:32:06 +02:00
4fd359406e
iasecc-sdo: fixed resource leak
2015-09-17 22:32:06 +02:00
1308fd0618
cwa14890: fixed resource leak
2015-09-17 22:32:06 +02:00
7fe4819a02
card-tcos: fixed resource leak
2015-09-17 22:32:06 +02:00
1e2a42dae5
Fixes warning about unused variables
2015-09-17 22:24:33 +02:00
fe31aceacb
Fixes signature of iasecc_read_public_key
2015-09-17 22:24:33 +02:00
be073396be
Fixes warnings about unused variables/functions
2015-09-17 22:24:33 +02:00
0fe282414f
Fixed warning about unused function
2015-09-17 22:24:33 +02:00
5902587889
Removed dead code
2015-09-17 22:24:33 +02:00
c22ffd95bf
Fixed warning about unused variable
2015-09-17 22:24:33 +02:00
6c01750ba8
Removes dead code
2015-09-17 22:24:33 +02:00
e4bce1ca61
Fixes dependency on uninitialized data
2015-09-17 22:24:33 +02:00
07038225a7
Fixes out of bounds read
2015-09-17 22:24:33 +02:00
69320f9d54
Checks for out of bounds write
2015-09-17 22:24:33 +02:00
f08985086a
Fixes potential buffer overrun
2015-09-17 22:24:33 +02:00
69de207c21
Fixes bad type cast
2015-09-17 22:24:33 +02:00
59254d9d88
Checks on errors for ftell and fseek
2015-09-17 22:24:33 +02:00
b5de72fe13
fix potention NULL deref
2015-09-17 22:24:33 +02:00
63a9ad79b6
Assumes that p15card->card are set
...
The check for NULL was bogus anyway
2015-09-17 22:24:33 +02:00
8a225eb42b
Avoids potential NULL pointer deref
2015-09-17 22:24:33 +02:00
30d4f52718
Checks untrusted input
2015-09-17 22:24:33 +02:00
ba3890f8e0
Checks result of calloc
2015-09-17 22:24:33 +02:00
de58f51012
msc: check the length of input
2015-09-17 22:24:33 +02:00
d20290d2b3
openpgp: match application, not ATR
...
fixes #391
closes #507
2015-09-16 09:48:23 +02:00
b28c48afe0
Fix OpenPGP driver to work correctly with YubiKey NEO
2015-09-16 09:48:23 +02:00
8aba7b9598
added missing files to WiX installer
...
fixes https://github.com/OpenSC/OpenSC/issues/488
2015-09-16 04:18:12 +02:00
cc6d7677da
Merge pull request #550 from frankmorgner/appveyor
...
adjust Make.rules.mak to work with AppVeyor
2015-09-14 18:35:54 +02:00
bf654540c5
Merge pull request #545 from frankmorgner/duplicate
...
avoid registering pkcs11 mechanisms multiple times
2015-09-14 12:41:37 +02:00
fb9dfc5b71
fixed warnings about possible data loss
2015-09-14 10:52:31 +02:00
76b6b483c7
Merge branch 'master' into gnuk
2015-09-13 22:09:59 +08:00
a906c6d7b8
Merge pull request #530 from NWilson/yubikey-neo-pin
...
Yubikey NEO pin functions support
2015-09-12 18:51:10 +02:00
5944915e0e
Merge pull request #549 from frankmorgner/547
...
fixed bad string comparison
2015-09-11 12:47:04 +02:00
0f2b9a4a4e
Merge pull request #543 from frankmorgner/appveyor
...
Use AppVeyor as good as we can
2015-09-10 16:40:58 +02:00
819a6686c9
use _WIN32 instead of WIN32
2015-09-10 15:23:18 +02:00
17c0ffc17e
Merge pull request #520 from frankmorgner/vendor-product
...
added call back for getting vendor/product id
2015-09-10 09:41:07 +02:00
6e3f94b3c9
fixed bad string comparison
...
fixes #547
2015-09-10 08:31:30 +02:00
d551f9a8e0
avoid registering pkcs11 mechanisms multiple times
...
fixes #349
2015-09-07 09:53:02 +02:00
b0c1e1fc89
Merge pull request #540 from nioncode/readDataObjectRawOption
...
add '--raw' option to pkcs15-tools '--read-data-object'
2015-09-04 15:31:16 +02:00
f44e229865
update help message to clarify that --raw only affects stdout behavior
2015-09-04 13:04:24 +02:00
72e25db360
sc-hsm: Add status info support for SmartCard-HSM V2.0
2015-09-03 21:49:24 +02:00
68796edf36
add '--raw' option to output 8 bit data instead of its hex representation
2015-09-03 15:09:23 +02:00
b2508b6c59
removed workaround for HP USB Smart Card Keyboard
...
Has been fixed by the CCID driver
https://lists.alioth.debian.org/pipermail/pcsclite-cvs-commit/2011-March/005218.html
2015-09-02 10:49:12 +02:00
cf2a9cbbb0
added call back for getting vendor/product id
...
implementation taken from
83142d4cae
2015-09-02 10:47:29 +02:00
29b85b43c0
Merge pull request #483 from adminmt/master
...
Update ATR and ATR mask for MaskTech smartcards
2015-09-02 10:41:06 +02:00
9456db90fc
handle record-based files correctly when doing file caching
...
implementation copied from `sc_pkcs15_read_file`
closes #372
2015-09-02 10:35:18 +02:00
c9efb2f643
make file cache dir configurable
...
in cases where you use pam_pkcs11, HOME might not be set
so paths based on $HOME are not usable, so that the combination
of home and caching does not work. Having the paths configurable
(together with a good setting of access rights)
resolves that problem.
2015-09-02 10:34:35 +02:00
Peter Marschall
Frank Morgner
vletoux
Doug Engert
Olaf Kirch
mdealencar
Andreas Schwier
Philip Wendland
Robert Ou
Nguyễn Hồng Quân
Nicolas Schneider
Andreas Kemnade