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

pkcs15init: useless if/else construction 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3986 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
viktor.tarasov 2010-02-02 18:15:53 +00:00
parent 6afab17c73
commit 4c34f5b28c
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -734,14 +734,7 @@ sc_pkcs15init_add_app(sc_card_t *card, struct sc_profile *profile,
/* XXX: encode the DDO? */
/* See if we've set an SO PIN */
if (pin_obj) {
r = sc_pkcs15init_add_object(p15spec, profile,
SC_PKCS15_AODF, pin_obj);
} else {
r = sc_pkcs15init_add_object(p15spec, profile,
SC_PKCS15_AODF, NULL);
}
r = sc_pkcs15init_add_object(p15spec, profile, SC_PKCS15_AODF, pin_obj);
if (r >= 0) {
r = sc_pkcs15init_update_dir(p15spec, profile, app);
if (r >= 0)
@ -2300,23 +2293,25 @@ select_object_path(sc_pkcs15_card_t *p15card, sc_profile_t *profile,
static int
sc_pkcs15init_update_dir(struct sc_pkcs15_card *p15card,
struct sc_profile *profile,
sc_app_info_t *app)
struct sc_app_info *app)
{
sc_card_t *card = p15card->card;
int r, retry = 1;
struct sc_card *card = p15card->card;
int r, retry = 1;
do {
struct sc_file *dir_file;
struct sc_path path;
r = sc_enum_apps(card);
if (r != SC_ERROR_FILE_NOT_FOUND)
break;
/* DIR file is not yet created. */
sc_format_path("3F002F00", &path);
if (sc_profile_get_file_by_path(profile, &path, &dir_file) < 0)
return r;
r = sc_profile_get_file_by_path(profile, &path, &dir_file);
SC_TEST_RET(card->ctx, r, "DIR file not defined in profile");
/* Create DIR file */
r = sc_pkcs15init_update_file(profile, card, dir_file, NULL, 0);
sc_file_free(dir_file);
} while (retry--);
@ -3231,6 +3226,7 @@ out: if (parent)
return r;
}
int
sc_pkcs15init_update_file(struct sc_profile *profile, sc_card_t *card,
sc_file_t *file, void *data, unsigned int datalen)