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

make casting explicit

This commit is contained in:
Frank Morgner 2015-11-01 13:18:39 +01:00
parent 98d7578113
commit 218a9eb52c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libopensc/base64.c
View File

@ -101,7 +101,7 @@ static int from_base64(const char *in, unsigned int *out, int *skip)
int sc_base64_encode(const u8 *in, size_t len, u8 *out, size_t outlen, size_t linelength)
{
unsigned int chars = 0;
size_t i, c;
unsigned int i, c;
linelength -= linelength & 0x03;
while (len >= 3) {
@ -125,7 +125,7 @@ int sc_base64_encode(const u8 *in, size_t len, u8 *out, size_t outlen, size_t li
}
i = c = 0;
while (c < len)
i |= *in++ << ((2 - c++) << 3);
i |= ((unsigned int) *in++) << ((2 - c++) << 3);
if (len) {
if (outlen < 4)
return SC_ERROR_BUFFER_TOO_SMALL;

9
src/libopensc/pkcs15-tccardos.c
View File

@ -210,7 +210,8 @@ static int parse_EF_CardInfo(sc_pkcs15_card_t *p15card)
u8 info2[MAX_INFO2_SIZE];
size_t info2_len = MAX_INFO2_SIZE;
u8 *p1, *p2;
size_t key_num, i;
size_t i;
unsigned int key_num;
struct sc_context *ctx = p15card->card->ctx;
size_t offset;
@ -223,8 +224,10 @@ static int parse_EF_CardInfo(sc_pkcs15_card_t *p15card)
if (r != SC_SUCCESS)
return SC_ERROR_WRONG_CARD;
/* get the number of private keys */
key_num = info1[info1_len-1] | (info1[info1_len-2] << 8) |
(info1[info1_len-3] << 16) | (info1[info1_len-4] << 24);
key_num = ((unsigned int) info1[info1_len-1])
| (((unsigned int) info1[info1_len-2]) << 8)
| (((unsigned int) info1[info1_len-3]) << 16)
| (((unsigned int) info1[info1_len-4]) << 24);
sc_debug(ctx, SC_LOG_DEBUG_NORMAL,
"found %d private keys\n", (int)key_num);
/* set p1 to the address of the first key descriptor */