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

free buf if pin was entered incorrectly.

Browse Source 
check if file is not NULL (out of memory).
free file, if something goes wrong.
free pin/puk once no longer needed.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2706 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aj 2005-12-05 21:31:20 +00:00
parent 131842c80b
commit 4863fb752d
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,7 @@ static char *getpin(const char *prompt)
return NULL;
if (strlen(pass) > 8) {
fprintf(stderr, "PIN code too long.\n");
free(buf);
return NULL;
}
memset(buf, 0, 8);
@ -591,6 +592,10 @@ static int create_key_files(void)
printf("Creating key files for %d keys.\n", opt_key_count);
file = sc_file_new();
if (!file) {
fprintf(stderr, "out of memory.\n");
return 1;
}
file->type = SC_FILE_TYPE_WORKING_EF;
file->ef_structure = SC_FILE_EF_TRANSPARENT;
@ -601,8 +606,10 @@ static int create_key_files(void)
sc_file_add_acl_entry(file, SC_AC_OP_INVALIDATE, SC_AC_CHV, 1);
sc_file_add_acl_entry(file, SC_AC_OP_REHABILITATE, SC_AC_CHV, 1);
if (select_app_df())
if (select_app_df()) {
sc_file_free(file);
return 1;
}
r = sc_create_file(card, file);
sc_file_free(file);
if (r) {
@ -611,6 +618,10 @@ static int create_key_files(void)
}
file = sc_file_new();
if (!file) {
fprintf(stderr, "out of memory.\n");
return 1;
}
file->type = SC_FILE_TYPE_WORKING_EF;
file->ef_structure = SC_FILE_EF_TRANSPARENT;
@ -984,8 +995,10 @@ static int create_pin_file(const sc_path_t *inpath, int chv, const char *key_id)
#endif
sprintf(prompt, "Please enter PUK for CHV%d%s: ", chv, key_id);
puk = getpin(prompt);
if (puk == NULL)
if (puk == NULL) {
free(pin);
return -1;
}
#if 0
sprintf(prompt, "Please enter PUK for CHV%d%s again: ", chv, key_id);
tmp = getpin(prompt);
@ -1011,6 +1024,9 @@ static int create_pin_file(const sc_path_t *inpath, int chv, const char *key_id)
*p++ = opt_puk_attempts;
*p++ = opt_puk_attempts;
len = p - buf;
free(pin);
free(puk);
file = sc_file_new();
file->type = SC_FILE_TYPE_WORKING_EF;