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

pkcs15init: profile: sc_profile_finish() accept additional parameter 'application info' ... 

Each application of the multi-application PKCS#15 card has it's own associated pkcs15init profile file.
Profile of the multi-application card contains an association between the ID of the on-card application 
and associated profile name.

When sc_profile_finish() is called
 - sc_card is connected,
 - information on the preset on-card applications is available;
 - AID of the applicaition to be binded is known.
thus allowing to sc_profile_finish() to load the final part of the profile.



git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5096 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
vtarasov 2011-01-17 14:51:10 +00:00
parent 41731ce56f
commit 35a54b511c
3 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,7 +360,7 @@ sc_pkcs15init_bind(struct sc_card *card, const char *name,
break;
}
r = sc_profile_finish(profile);
r = sc_profile_finish(profile, NULL);
if (r < 0)
sc_log(ctx, "Failed to finalize profile: %s", sc_strerror(r));
} while (0);

36
src/pkcs15init/profile.c
View File

@ -384,25 +384,42 @@ sc_profile_load(struct sc_profile *profile, const char *filename)
SC_FUNC_RETURN(ctx, SC_LOG_DEBUG_NORMAL, res);
}
int
sc_profile_finish(struct sc_profile *profile)
sc_profile_finish(struct sc_profile *profile, const struct sc_app_info *app_info)
{
struct sc_context *ctx = profile->card->ctx;
struct file_info *fi;
struct pin_info *pi;
char reason[64];
SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_NORMAL);
LOG_FUNC_CALLED(ctx);
profile->mf_info = sc_profile_find_file(profile, NULL, "MF");
if (!profile->mf_info) {
strcpy(reason, "Profile doesn't define a MF");
goto whine;
if (!profile->mf_info)
LOG_TEST_RET(ctx, SC_ERROR_INCONSISTENT_PROFILE, "Profile doesn't define a MF");
if (app_info && app_info->aid.len) {
struct sc_path path;
sc_log(ctx, "finish profile with '%s' application profile", app_info->label);
memset(&path, 0, sizeof(struct sc_path));
path.type = SC_PATH_TYPE_DF_NAME;
path.aid = app_info->aid;
sc_log(ctx, "Look for file by path '%s'", sc_print_path(&path));
profile->df_info = sc_profile_find_file_by_path(profile, &path);
sc_log(ctx, "returned DF info %p", profile->df_info);
if (profile->df_info && profile->df_info->profile_extention) {
sc_log(ctx, "application profile extention '%s'", profile->df_info->profile_extention);
if (sc_profile_load(profile, profile->df_info->profile_extention))
LOG_TEST_RET(ctx, SC_ERROR_INCONSISTENT_PROFILE, "Cannot load application profile extention");
}
}
profile->df_info = sc_profile_find_file(profile, NULL, "PKCS15-AppDF");
if (!profile->df_info) {
strcpy(reason, "Profile doesn't define a PKCS15-AppDF");
goto whine;
}
if (!profile->df_info)
LOG_TEST_RET(ctx, SC_ERROR_INCONSISTENT_PROFILE, "Profile doesn't define a PKCS15-AppDF");
profile->p15_spec->file_app = profile->df_info->file;
profile->df_info->dont_free = 1;
@ -416,6 +433,7 @@ sc_profile_finish(struct sc_profile *profile)
snprintf(reason, sizeof(reason), "unknown PIN file \"%s\"\n", name);
goto whine;
}
pi->file = fi;
}
SC_FUNC_RETURN(ctx, SC_LOG_DEBUG_NORMAL, SC_SUCCESS);

7
src/pkcs15init/profile.h
View File

@ -38,6 +38,11 @@ struct file_info {
struct sc_profile * base_template;
unsigned int inst_index;
sc_path_t inst_path;
/* Profile extention dependent on the application ID (sub-profile).
* Sub-profile is loaded when binding to the particular application
* of the multi-application PKCS#15 card. */
char * profile_extention;
};
/* For now, we assume the PUK always resides
@ -123,7 +128,7 @@ struct sc_profile {
struct sc_profile *sc_profile_new(void);
int sc_profile_load(struct sc_profile *, const char *);
int sc_profile_finish(struct sc_profile *);
int sc_profile_finish(struct sc_profile *, const struct sc_app_info *);
void sc_profile_free(struct sc_profile *);
int sc_profile_build_pkcs15(struct sc_profile *);
void sc_profile_get_pin_info(struct sc_profile *,