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

add option to write data objects; patch supplied by Cornelius Kölbel <cornelius.koelbel@lsexperts.de> et. al. 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3017 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
nils 2006-09-18 05:30:41 +00:00
parent 1104e92bde
commit a127dd93ef
1 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/tools/pkcs11-tool.c
View File

@ -48,7 +48,8 @@ enum {
OPT_INIT_TOKEN,
OPT_INIT_PIN,
OPT_ATTR_FROM,
OPT_KEY_TYPE
OPT_KEY_TYPE,
OPT_PRIVATE
};
const struct option options[] = {
@ -71,7 +72,7 @@ const struct option options[] = {
{ "key-type", 1, 0, OPT_KEY_TYPE },
{ "write-object", 1, 0, 'w' },
{ "read-object", 0, 0, 'r' },
{ "application-id", 1, 0, OPT_APPLICATION_ID },
{ "application-id", 1, 0, OPT_APPLICATION_ID },
{ "type", 1, 0, 'y' },
{ "id", 1, 0, 'd' },
{ "label", 1, 0, 'a' },
@ -86,6 +87,7 @@ const struct option options[] = {
{ "test", 0, 0, 't' },
{ "moz-cert", 1, 0, 'z' },
{ "verbose", 0, 0, 'v' },
{ "private", 0, 0, OPT_PRIVATE },
{ 0, 0, 0, 0 }
};
@ -110,7 +112,7 @@ const char *option_help[] = {
"Write an object (key, cert) to the card",
"Get object's CKA_VALUE attribute (use with --type)",
"Specify the application id of the data object (use with --type data)",
"Specify the type of object (e.g. cert, privkey, pubkey)",
"Specify the type of object (e.g. cert, privkey, pubkey, data)",
"Specify the id of the object",
"Specify the label of the object",
"Specify number of the slot to use",
@ -124,6 +126,7 @@ const char *option_help[] = {
"Test (best used with the --login or --pin option)",
"Test Mozilla-like keypair gen and cert req, <arg>=certfile",
"Verbose operation. Use several times to enable debug output.",
"Set the CKA_PRIVATE attribute (object is only viewable after a login)"
};
const char * app_name = "pkcs11-tool"; /* for utils.c */
@ -146,6 +149,7 @@ static char * opt_pin = NULL;
static char * opt_so_pin = NULL;
static char * opt_application_id = NULL;
static char * opt_key_type = NULL;
static int opt_is_private = 0;
static void *module = NULL;
static CK_FUNCTION_LIST_PTR p11 = NULL;
@ -419,6 +423,9 @@ main(int argc, char * argv[])
case OPT_KEY_TYPE:
opt_key_type = optarg;
break;
case OPT_PRIVATE:
opt_is_private = 1;
break;
default:
print_usage_and_die();
}
@ -1163,9 +1170,9 @@ write_object(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
unsigned char certdata[MAX_OBJECT_SIZE];
int certdata_len = 0;
FILE *f;
CK_OBJECT_HANDLE cert_obj, privkey_obj;
CK_ATTRIBUTE cert_templ[20], privkey_templ[20];
int n_cert_attr = 0, n_privkey_attr = 0;
CK_OBJECT_HANDLE cert_obj, privkey_obj, data_obj;
CK_ATTRIBUTE cert_templ[20], privkey_templ[20], data_templ[20];
int n_cert_attr = 0, n_privkey_attr = 0, n_data_attr = 0;
#if 0
CK_ATTRIBUTE pubkey_templ[20];
CK_OBJECT_HANDLE pubkey_obj;
@ -1305,10 +1312,44 @@ write_object(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
rsa.coefficient, rsa.coefficient_len);
n_privkey_attr++;
#endif
}
else
if (opt_object_class == CKO_DATA) {
CK_OBJECT_CLASS clazz = CKO_DATA;
FILL_ATTR(data_templ[0], CKA_CLASS, &clazz, sizeof(clazz));
FILL_ATTR(data_templ[1], CKA_TOKEN, &_true, sizeof(_true));
FILL_ATTR(data_templ[2], CKA_VALUE, &contents, contents_len);
n_data_attr = 3;
if (opt_is_private != 0) {
FILL_ATTR(data_templ[n_data_attr], CKA_PRIVATE,
&_true, sizeof(_true));
}
if (opt_application_id != NULL) {
FILL_ATTR(data_templ[n_data_attr], CKA_APPLICATION,
opt_application_id, strlen(opt_application_id));
n_data_attr++;
}
if (opt_object_label != NULL) {
FILL_ATTR(data_templ[n_data_attr], CKA_LABEL,
opt_object_label, strlen(opt_object_label));
n_data_attr++;
}
}
else
fatal("Writing of a \"%s\" type not (yet) supported\n", opt_object_class_str);
if (n_data_attr) {
rv = p11->C_CreateObject(session, data_templ, n_data_attr, &data_obj);
if (rv != CKR_OK)
p11_fatal("C_CreateObject", rv);
printf("Generated Data Object:\n");
show_dobj(session, data_obj);
}
if (n_cert_attr) {
rv = p11->C_CreateObject(session, cert_templ, n_cert_attr, &cert_obj);
if (rv != CKR_OK)