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

pkcs15init: when deleting object, do not try to select object file without valid path 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5336 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
vtarasov 2011-04-12 17:59:59 +00:00
parent 622570a28e
commit 7b6cf4219e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pkcs15init/pkcs15-lib.c
View File

@ -2696,7 +2696,7 @@ sc_pkcs15init_delete_object(struct sc_pkcs15_card *p15card, struct sc_profile *p
struct sc_file *file = NULL;
struct sc_path path;
struct sc_pkcs15_df *df;
int r, stored_in_ef = 0;
int r = 0, stored_in_ef = 0;
LOG_FUNC_CALLED(ctx);
switch(obj->type & SC_PKCS15_TYPE_CLASS_MASK) {
@ -2717,13 +2717,14 @@ sc_pkcs15init_delete_object(struct sc_pkcs15_card *p15card, struct sc_profile *p
}
sc_log(ctx, "delete object(type:%X) with path(type:%X,%s)", obj->type, path.type, sc_print_path(&path));
r = sc_select_file(p15card->card, &path, &file);
if (r != SC_ERROR_FILE_NOT_FOUND)
LOG_TEST_RET(ctx, r, "select object path failed");
if (path.len || path.aid.len) {
r = sc_select_file(p15card->card, &path, &file);
if (r != SC_ERROR_FILE_NOT_FOUND)
LOG_TEST_RET(ctx, r, "select object path failed");
stored_in_ef = (file->type != SC_FILE_TYPE_DF);
sc_file_free(file);
stored_in_ef = (file->type != SC_FILE_TYPE_DF);
sc_file_free(file);
}
if (!r) {
/* If the object is stored in a normal EF, try to delete the EF. */