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

Add the AuthID when writing pkcs15 data objects 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1196 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
sth 2003-06-12 21:23:01 +00:00
parent aecd987286
commit 694a649ab8
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -563,6 +563,7 @@ sc_pkcs15init_init_prkdf(struct sc_pkcs15init_prkeyargs *keyargs,
if (keyargs->x509_usage)
usage = sc_pkcs15init_map_usage(keyargs->x509_usage, 1);
}
if ((label = keyargs->label) == NULL)
label = "Private Key";
@ -994,6 +995,11 @@ sc_pkcs15init_store_data_object(struct sc_pkcs15_card *p15card,
if ((r = select_id(p15card, SC_PKCS15_TYPE_DATA_OBJECT, &args->id)) < 0)
return r;
/* Set the USER PIN reference from args */
r = set_user_pin_from_authid(p15card, profile, &args->auth_id);
if (r < 0)
return r;
#ifdef notused
if (args->id.len != 0) {
sc_pkcs15_object_t *objp;
@ -1027,6 +1033,7 @@ sc_pkcs15init_store_data_object(struct sc_pkcs15_card *p15card,
object->type = SC_PKCS15_TYPE_DATA_OBJECT;
object->data = data_object_info;
object->flags = DEFAULT_DATA_FLAGS;
object->auth_id = args->auth_id;
strncpy(object->label, label, sizeof(object->label));
r = sc_pkcs15init_store_data(p15card, profile,
SC_PKCS15_TYPE_DATA_OBJECT, &args->der_encoded,

2
src/tools/pkcs15-init.c
View File

@ -758,6 +758,8 @@ do_store_data_object(struct sc_profile *profile)
if (opt_objectid)
sc_pkcs15_format_id(opt_objectid, &args.id);
if (opt_authid)
sc_pkcs15_format_id(opt_authid, &args.auth_id);
args.label = opt_label;
r = do_read_data_object(opt_infile, &data, &datalen);