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

Merge pull request #26 from viktorTarasov/staging 

merge 'master' into 'staging'
This commit is contained in:
Ludovic Rousseau 2012-02-22 09:38:37 -08:00
parent 63eb4a4b4b af559fbffd
commit 594427e516
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1414,7 +1414,7 @@ sc_pkcs15init_store_public_key(struct sc_pkcs15_card *p15card,
}
if ((usage = keyargs->usage) == 0) {
usage = SC_PKCS15_PRKEY_USAGE_SIGN;
usage = SC_PKCS15_PRKEY_USAGE_VERIFY;
if (keyargs->x509_usage)
usage = sc_pkcs15init_map_usage(keyargs->x509_usage, 0);
}

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

@ -1002,6 +1002,7 @@ do_store_public_key(struct sc_profile *profile, EVP_PKEY *pkey)
if (opt_objectid)
sc_pkcs15_format_id(opt_objectid, &args.id);
args.label = (opt_pubkey_label != 0 ? opt_pubkey_label : opt_label);
args.x509_usage = opt_x509_usage;
if (pkey == NULL)
r = do_read_public_key(opt_infile, opt_format, &pkey);
@ -2728,7 +2729,7 @@ int get_pin(sc_ui_hints_t *hints, char **out)
int flags = hints->flags;
pin_info = hints->info.pin;
if (pin_info && pin_info->auth_type == SC_PKCS15_PIN_AUTH_TYPE_PIN)
if (pin_info && pin_info->auth_type != SC_PKCS15_PIN_AUTH_TYPE_PIN)
return SC_ERROR_NOT_SUPPORTED;
if (!(label = hints->obj_label)) {