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

Fix compiler warnings, for digital cc this time 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@187 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aet 2002-01-22 16:26:19 +00:00
parent b9c165125b
commit c8313fb07c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libopensc/card-flex.c
View File

@ -298,7 +298,7 @@ static int flex_select_file(struct sc_card *card, const struct sc_path *path,
r = sc_lock(card);
SC_TEST_RET(card->ctx, r, "sc_lock() failed");
if (!magic_done && memcmp(pathptr, "\x3F\x00", 2) != 0) {
r = select_file_id(card, "\x3F\x00", 2, 0, NULL);
r = select_file_id(card, (const u8 *) "\x3F\x00", 2, 0, NULL);
if (r)
sc_unlock(card);
SC_TEST_RET(card->ctx, r, "Unable to select Master File (MF)");

13
src/tools/cryptoflex-tool.c
View File

@ -36,7 +36,7 @@ int opt_pin_attempts = 10;
int opt_puk_attempts = 10;
const char *opt_appdf = NULL, *opt_prkeyf = NULL, *opt_pubkeyf = NULL;
unsigned char *pincode = NULL;
u8 *pincode = NULL;
const struct option options[] = {
{ "create-pkcs15", 0, 0, 'C' },
@ -82,8 +82,7 @@ struct sc_card *card = NULL;
char *getpin(const char *prompt)
{
u8 *buf;
char pass[20];
char *buf, pass[20];
int i;
printf("%s", prompt);
@ -103,7 +102,7 @@ char *getpin(const char *prompt)
return NULL;
}
memset(buf, 0, 8);
strncpy((char *) buf, pass, 8);
strncpy(buf, pass, 8);
memset(pass, 0, strlen(pass));
return buf;
}
@ -115,8 +114,8 @@ int verify_pin(int pin)
if (pincode == NULL) {
sprintf(prompt, "Please enter CHV%d: ", pin);
pincode = getpin(prompt);
if (pincode == NULL || strlen(pincode) == 0)
pincode = (u8 *) getpin(prompt);
if (pincode == NULL || strlen((char *) pincode) == 0)
return -1;
}
if (pin == 1)
@ -1037,7 +1036,7 @@ int create_pin_file(const struct sc_path *inpath, int chv, const char *key_id)
fprintf(stderr, "Unable to select created PIN file: %s\n", sc_strerror(r));
return r;
}
r = sc_update_binary(card, 0, buf, len, 0);
r = sc_update_binary(card, 0, (const u8 *) buf, len, 0);
if (r < 0) {
fprintf(stderr, "Unable to update created PIN file: %s\n", sc_strerror(r));
return r;