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
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
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
3916117008
Merge branch 'OpenSC-master' into ecc_minidriver
2015-10-14 22:23:18 +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
5422887f9b
reflect dependency to OS X 10.10 in dmg description
2015-10-14 14:34:20 +02:00
094179ce5c
'.so' is also the OS X suffix for pkcs11
2015-10-14 14:34:20 +02:00
b9b3b2a86e
check for OpenSSL headers in auto-detection
...
OpenSSL headers have been removed on El Capitane which renders it
unusable for us.
2015-10-14 14:34:19 +02:00
bccf2120cd
use PREFIX as shortcut in build script
2015-10-13 15:05:28 +02:00
66415690d9
OSX: link pkcs11 library to /usr/local/lib
...
Circumvents SIP on El Capitan
2015-10-13 15:01:40 +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
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
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
Peter Marschall
Frank Morgner
vletoux
Doug Engert