* shift libpkcs11 from src/pkcs11 to src/common as it is not used to implement the OpenSC PKCS#11 module
* invent a "libscdl" mini library that implements either libltdl based dynamic loading or uses native interfaces
* drop hard requirement for libltl to build OpenSC
* native Windows build does not need libltdl any more
* specify CNGSDK include dir to find cardmod.h. CNGSDK only registers with a handful of compilers
Deals with #323
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5201 c6295689-39f2-0310-b995-f0e70906c6a9
The registry in no longer used to pass the
handles provided by BaseCSP. sc_ctx_use_reader
is used instead. (uses r5190)
A decryption routine was added as it is needed by login.
Key container names are based on the card serial
number and cert ID. The must be unique as they
are searched for in the certificate store to
find the card to insert in some situations.
If the handles change, the association to the reader
and card is refreshed as it may be a different card
or reader. (uses r5127)
Extra low lowel debugging was added. To use
it the CARDMOD_LOW_LEVEL_DEBUG but be defined in
cardmod.c This can log entries before and sc_context
is established.
The use of "texte" was replaced, as it looked like there
could be buffer overflows. It was replaced with a
loghex routine.
SC_ALGORITHM_RSA_HASH_MD5_SHA1 can now be used
(IE uses this.)
Several other bugs were fixed.
The code can now bue used for AD login, and was tested
with swaping cards duirng login, and with several readers.
The code is still experimental, and for login to work,
the dlls were moved to system32.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5192 c6295689-39f2-0310-b995-f0e70906c6a9
It is used by cardmod to pass in pointers to the PC/SC handles
provided by the caller of cardmod. Other drivers will return
an error if this routine called.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5190 c6295689-39f2-0310-b995-f0e70906c6a9
to PIV KEY Management keys and certificates, includeing the Retired keys.
This applies to 0.12.0 and needs to be in 0.12.1
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5189 c6295689-39f2-0310-b995-f0e70906c6a9
p15card-helper.c:263:22: warning: Although the value stored to 'r' is used in
the enclosing expression, the value is never actually read from 'r'
...!= (r = sc_pkcs15emu_add_x509_cert(p15card, &cert_obj, &cert_info))) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
p15card-helper.c:237:22: warning: Although the value stored to 'r' is used in
the enclosing expression, the value is never actually read from 'r'
...if(SC_SUCCESS != (r = sc_select_file(card, &cert_info.path, NULL))) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
p15card-helper.c:224:3: warning: Value stored to 'r' is never read
r = SC_SUCCESS;
^ ~~~~~~~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5182 c6295689-39f2-0310-b995-f0e70906c6a9
pkcs15-oberthur.c:353:3: warning: Value stored to 'len' is never read
len = sizeof(label) - 1;
^ ~~~~~~~~~~~~~~~~~
pkcs15-oberthur.c:587:3: warning: Value stored to 'sz' is never read
...sz = len > sizeof(key_obj.label) - 1 ? sizeof(key_obj.label) - 1 : len;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
pkcs15-oberthur.c:669:2: warning: Value stored to 'offs' is never read
offs += 2 + len;
^ ~~~~~~~
pkcs15-oberthur.c:656:3: warning: Value stored to 'sz' is never read
...sz = len > sizeof(cobj.label) - 1 ? sizeof(cobj.label) - 1 : len;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5181 c6295689-39f2-0310-b995-f0e70906c6a9
pkcs15-tccardos.c:253:3: warning: Value stored to 'pinType' is never read
pinType = key_descr & TC_CARDOS_PIN_MASK;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5179 c6295689-39f2-0310-b995-f0e70906c6a9
card-authentic.c:913:33: warning: Field access results in a dereference of a
null pointer (loaded from variable 'apdus')
rv = sc_check_sw(card, apdus->sw1, apdus->sw2);
~~~~~ ^
card-authentic.c:958:33: warning: Field access results in a dereference of a
null pointer (loaded from variable 'apdus')
rv = sc_check_sw(card, apdus->sw1, apdus->sw2);
~~~~~ ^
card-authentic.c:1001:33: warning: Field access results in a dereference of a
null pointer (loaded from variable 'apdus')
rv = sc_check_sw(card, apdus->sw1, apdus->sw2);
~~~~~ ^
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5176 c6295689-39f2-0310-b995-f0e70906c6a9
card-authentic.c:440:2: warning: Value stored to 'resp_len' is never read
resp_len = sizeof(resp);
^ ~~~~~~~~~~~~
card-authentic.c:1053:4: warning: Value stored to 'acls' is never read
acls = acls_NEVER;
^ ~~~~~~~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5175 c6295689-39f2-0310-b995-f0e70906c6a9
card-ias.c:132:32: warning: Although the value stored to 'ins' is used in the
enclosing expression, the value is never actually read from 'ins'
r = len = pad = use_pin_pad = ins = p1 = 0;
^ ~~~~~~
card-ias.c:132:2: warning: Value stored to 'r' is never read
r = len = pad = use_pin_pad = ins = p1 = 0;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
card-ias.c:366:2: warning: Value stored to 'ctx' is never read
ctx = card->ctx;
^ ~~~~~~~~~
card-ias.c:361:6: warning: Although the value stored to 'pathlen' is used in the
enclosing expression, the value is never actually read from 'pathlen'
r = pathlen = stripped_len = offset = 0;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~
card-ias.c:361:2: warning: Value stored to 'r' is never read
r = pathlen = stripped_len = offset = 0;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
card-ias.c:361:31: warning: Although the value stored to 'offset' is used in the
enclosing expression, the value is never actually read from 'offset'
r = pathlen = stripped_len = offset = 0;
^ ~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5174 c6295689-39f2-0310-b995-f0e70906c6a9
card-westcos.c:1066:4: warning: Value stored to 'r' is never read
r = SC_ERROR_INVALID_ARGUMENTS;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5173 c6295689-39f2-0310-b995-f0e70906c6a9
card-asepcos.c:446:19: warning: Value stored to 'p' during its initialization is
never read
u8 buf[64], *p = buf;
^ ~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5172 c6295689-39f2-0310-b995-f0e70906c6a9
card-piv.c:614:2: warning: Value stored to 'buf_end' is never read
buf_end = rp + buf_len;
^ ~~~~~~~~~~~~
card-piv.c:1129:3: warning: Value stored to 'r' is never read
r = 0;
^ ~
card-piv.c:1478:2: warning: Value stored to 'q' is never read
q = rbuf;
^ ~~~~
card-piv.c:1628:2: warning: Value stored to 'q' is never read
q = rbuf;
^ ~~~~
card-piv.c:2456:4: warning: Value stored to 'certobjlen' is never read
certobjlen = 0;
^ ~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5170 c6295689-39f2-0310-b995-f0e70906c6a9
card-atrust-acos.c:548:2: warning: Value stored to 'keyID' is never read
keyID = env->key_ref[0];
^ ~~~~~~~~~~~~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5169 c6295689-39f2-0310-b995-f0e70906c6a9
If card is NULL we can't dereference card->ctx to log an error
We must assume card i snever NULL
card-oberthur.c:1537:3: warning: Field access results in a dereference of a null
pointer (loaded from variable 'card')
...SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, SC_ERROR_INVALID_ARGUMENTS)...
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
card-oberthur.c:1537:24: note: instantiated from:
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, ...
~~~~ ^
card-oberthur.c:2258:3: warning: Field access results in a dereference of a null
pointer (loaded from variable 'card')
...SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, SC_ERROR_INVALID_ARGUMENTS)...
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
card-oberthur.c:2258:24: note: instantiated from:
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, ...
~~~~ ^
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5168 c6295689-39f2-0310-b995-f0e70906c6a9
card-oberthur.c:1539:2: warning: Value stored to 'prv' is never read
prv = (struct auth_private_data *) card->drv_data;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5167 c6295689-39f2-0310-b995-f0e70906c6a9
card-starcos.c:657:5: warning: Value stored to 'p' is never read
*p++ = file->record_length & 0xff;
^~~
card-starcos.c:652:5: warning: Value stored to 'p' is never read
*p++ = file->record_length & 0xff;
^~~
card-starcos.c:647:5: warning: Value stored to 'p' is never read
*p++ = file->size & 0xff;
^~~
card-starcos.c:609:4: warning: Value stored to 'p' is never read
*p++ = tmp; /* SM ISF */
^~~
card-starcos.c:572:4: warning: Value stored to 'p' is never read
*p++ = tmp;
^~~
card-starcos.c:1024:2: warning: Value stored to 'keyID' is never read
keyID = env->key_ref[0];
^ ~~~~~~~~~~~~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5166 c6295689-39f2-0310-b995-f0e70906c6a9
card-mcrd.c:1023:20: warning: Value stored to 'linep' during its initialization
is never read
char line[256], *linep = line;
^ ~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5165 c6295689-39f2-0310-b995-f0e70906c6a9
card-flex.c:358:2: warning: Value stored to 'left' is never read
left = *p++;
^ ~~~~
card-flex.c:358:10: warning: Value stored to 'p' is never read
left = *p++;
^~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5163 c6295689-39f2-0310-b995-f0e70906c6a9
muscle.c:417:2: warning: Value stored to 'ptr' is never read
ptr += newPinLength;
^ ~~~~~~~~~~~~
muscle.c:918:2: warning: Value stored to 'inPtr' is never read
inPtr += toSend;
^ ~~~~~~
muscle.c:917:2: warning: Value stored to 'left' is never read
left -= toSend;
^ ~~~~~~
muscle.c:1012:26: warning: Value stored to 'p' is never read
ushort2bebytes(p, use); p+=2;
^ ~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5160 c6295689-39f2-0310-b995-f0e70906c6a9
pkcs15-gemsafeV1.c:262:5: warning: Value stored to 'endptr' is never read
endptr = (char *)(apdu.resp + apdu.resplen);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5159 c6295689-39f2-0310-b995-f0e70906c6a9
pkcs15.c:1033:3: warning: Value stored to 'r' is never read
r = sc_pkcs15_parse_df(p15card, df);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
pkcs15.c:1677:3: warning: Value stored to 'obj_len' is never read
obj_len = p - oldp;
^ ~~~~~~~~
pkcs15.c:1948:4: warning: Value stored to 'r' is never read
r = len;
^ ~~~
pkcs15.c:1942:6: warning: Value stored to 'record_len' is never read
record_len = head[2] * 256 + head[3];
^ ~~~~~~~~~~~~~~~~~~~~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5158 c6295689-39f2-0310-b995-f0e70906c6a9
apdu.c:166:5: warning: Value stored to 'p' is never read
*p++ = (u8)apdu->le;
^~~
apdu.c:156:4: warning: Value stored to 'p' is never read
p += apdu->lc & 0xff;
^ ~~~~~~~~~~~~~~~
apdu.c:147:5: warning: Value stored to 'p' is never read
*p++ = (u8)apdu->le;
^~~
apdu.c:139:3: warning: Value stored to 'p' is never read
p += apdu->lc;
^ ~~~~~~~~
apdu.c:118:3: warning: Value stored to 'p' is never read
p += apdu->lc;
^ ~~~~~~~~
apdu.c:112:5: warning: Value stored to 'p' is never read
*p++ = (u8)apdu->le;
^~~
apdu.c:107:5: warning: Value stored to 'p' is never read
*p++ = (u8)apdu->le;
^~~
apdu.c:102:4: warning: Value stored to 'p' is never read
*p++ = (u8)apdu->le;
^~~
apdu.c:99:5: warning: Value stored to 'p' is never read
*p++ = (u8)0x00;
^~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5157 c6295689-39f2-0310-b995-f0e70906c6a9
ef-atr.c:41:16: warning: Value stored to 'category' during its initialization is
never read
unsigned char category = *buf;
^ ~~~~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5156 c6295689-39f2-0310-b995-f0e70906c6a9
log.c:107:2: warning: Value stored to 'left' is never read
left -= r;
^ ~
log.c:106:2: warning: Value stored to 'p' is never read
p += r;
^ ~
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5154 c6295689-39f2-0310-b995-f0e70906c6a9
sc.c:667:12: warning: The left operand of '>=' is a garbage value
if (tx[2] >= 0)
~~~~~ ^
sc.c:656:12: warning: The left operand of '>=' is a garbage value
if (tx[0] >= 0) {
~~~~~ ^
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5152 c6295689-39f2-0310-b995-f0e70906c6a9
martin
vtarasov
dengert
andre
ludovic.rousseau