giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Address compiler warnings when using --disable-optimization (#1325) 

* Handle errors as intended in sc_pkcs15emu_openpgp_add_data()

If a data object can be read, but it cannot be added to the PKCS#15
framework, return from this function with an error; do not continue
reading other data objects. Otherwise, do not return an error from
this function when a data object cannot be read or is empty.

Improve existing comments for clarity.

* Address other compiler warnings when using --disable-optimization

Certain variables that are not initialized when they are declared
prevent the build from completing, when --disable-optimization is
passed to ./configure.
This commit is contained in:
David Ward 2018-04-15 03:37:43 -04:00 committed by Frank Morgner
parent 5abe99d228
commit 2c167a9982
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libopensc/iasecc-sdo.c
View File

@ -83,7 +83,7 @@ iasecc_sdo_convert_acl(struct sc_card *card, struct iasecc_sdo *sdo,
{SC_AC_OP_READ, IASECC_ACL_GET_DATA},
{0x00, 0x00}
};
unsigned char mask = 0x80, op_mask;
unsigned char mask = 0x80, op_mask = 0;
int ii;
LOG_FUNC_CALLED(ctx);
@ -94,10 +94,10 @@ iasecc_sdo_convert_acl(struct sc_card *card, struct iasecc_sdo *sdo,
break;
}
}
if (ops[ii].mask == 0)
if (op_mask == 0)
LOG_FUNC_RETURN(ctx, SC_ERROR_UNKNOWN_DATA_RECEIVED);
sc_log(ctx, "OP:%i, mask:0x%X", op, ops[ii].mask);
sc_log(ctx, "OP:%i, mask:0x%X", op, op_mask);
sc_log(ctx, "AMB:%X, scbs:%s", sdo->docp.amb, sc_dump_hex(sdo->docp.scbs, IASECC_MAX_SCBS));
sc_log(ctx, "docp.acls_contact:%s", sc_dump_hex(sdo->docp.acls_contact.value, sdo->docp.acls_contact.size));

13
src/libopensc/pkcs15-openpgp.c
View File

@ -371,7 +371,9 @@ sc_pkcs15emu_openpgp_init(sc_pkcs15_card_t *p15card)
goto failed;
}
/* PKCS#15 DATA object from OpenPGP private DOs */
/* Add PKCS#15 DATA objects from other OpenPGP card DOs. The return
* value is ignored, so this will not cause initialization to fail.
*/
sc_pkcs15emu_openpgp_add_data(p15card);
failed:
@ -392,7 +394,7 @@ sc_pkcs15emu_openpgp_add_data(sc_pkcs15_card_t *p15card)
int i, r;
LOG_FUNC_CALLED(ctx);
/* There is 4 private DO from 0101 to 0104 */
/* Optional private use DOs 0101 to 0104 */
for (i = 1; i <= PGP_NUM_PRIVDO; i++) {
sc_pkcs15_data_info_t dat_info;
sc_pkcs15_object_t dat_obj;
@ -405,8 +407,8 @@ sc_pkcs15emu_openpgp_add_data(sc_pkcs15_card_t *p15card)
snprintf(name, 8, "PrivDO%d", i);
snprintf(path, 9, "3F00010%d", i);
/* Check if the DO can be read.
* We won't expose pkcs15 DATA object if DO is empty.
/* Check if the DO can be read and is not empty. Otherwise we
* won't expose a PKCS#15 DATA object.
*/
r = read_file(p15card->card, path, content, sizeof(content));
if (r <= 0 ) {
@ -428,8 +430,9 @@ sc_pkcs15emu_openpgp_add_data(sc_pkcs15_card_t *p15card)
sc_log(ctx, "Add %s data object", name);
r = sc_pkcs15emu_add_data_object(p15card, &dat_obj, &dat_info);
LOG_TEST_RET(ctx, r, "Could not add data object to framework");
}
LOG_FUNC_RETURN(ctx, r);
LOG_FUNC_RETURN(ctx, SC_SUCCESS);
}
static int openpgp_detect_card(sc_pkcs15_card_t *p15card)

2
src/pkcs11/openssl.c
View File

@ -329,7 +329,7 @@ static CK_RV gostr3410_verify_data(const unsigned char *pubkey, int pubkey_len,
EVP_PKEY_CTX *pkey_ctx = NULL;
EC_POINT *P;
BIGNUM *X, *Y;
ASN1_OCTET_STRING *octet;
ASN1_OCTET_STRING *octet = NULL;
const EC_GROUP *group = NULL;
char paramset[2] = "A";
int r = -1, ret_vrf = 0;

2
src/tools/pkcs11-tool.c
View File

@ -3234,7 +3234,7 @@ find_mechanism(CK_SLOT_ID slot, CK_FLAGS flags,
count = get_mechanisms(slot, &mechs, flags);
if (count) {
if (list && list_len) {
unsigned ii, jj;
unsigned ii = list_len, jj;
for (jj=0; jj<count; jj++) {
for (ii=0; ii<list_len; ii++)