pkcs15init profile: 'private key' as BSO is differenciated from the one as EF

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3920 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
viktor.tarasov 2010-01-21 10:07:40 +00:00
parent 6fc954cbc6
commit 39a70345b9
9 changed files with 9 additions and 35 deletions

View File

@ -145,10 +145,8 @@ filesystem {
}
template key-domain {
# This is a dummy entry - pkcs15-init insists that
# this is present
EF private-key {
file-id = FFFF;
BSO private-key {
# here ACLs should be defined
}
EF public-key {
file-id = 3000;

View File

@ -47,10 +47,8 @@ filesystem {
# combined with the last octet of the object's pkcs15 id
# to form a unique file ID.
template key-domain {
# This is a dummy entry - pkcs15-init insists that
# this is present
EF private-key {
file-id = FFFF;
BSO private-key {
# here ACLs should be defined
}
EF public-key {
file-id = 3003;

View File

@ -118,11 +118,8 @@ filesystem {
ACL = $protected;
}
template key-domain {
# This is a dummy entry - pkcs15-init insists that
# this is present
EF private-key {
file-id = FFFF;
ACL = *=$PIN, READ=NEVER;
BSO private-key {
ACL = *=$PIN, READ=NEVER;
}
EF public-key {
file-id = 3000;

View File

@ -304,16 +304,11 @@ static int entersafe_create_pin(sc_profile_t *profile, sc_card_t *card,
static int entersafe_key_reference(sc_profile_t *profile, sc_card_t *card,
sc_pkcs15_prkey_info_t *prkey)
{
struct sc_file *df = profile->df_info->file;
SC_FUNC_CALLED(card->ctx, 1);
if (prkey->key_reference < ENTERSAFE_MIN_KEY_ID)
prkey->key_reference = ENTERSAFE_MIN_KEY_ID;
if (prkey->key_reference > ENTERSAFE_MAX_KEY_ID)
return SC_ERROR_TOO_MANY_OBJECTS;
prkey->path = df->path;
SC_FUNC_RETURN(card->ctx,4,SC_SUCCESS);
}

View File

@ -243,14 +243,10 @@ static int
incrypto34_select_key_reference(sc_profile_t *profile, sc_card_t *card,
sc_pkcs15_prkey_info_t *key_info)
{
struct sc_file *df = profile->df_info->file;
if (key_info->key_reference < INCRYPTO34_KEY_ID_MIN)
key_info->key_reference = INCRYPTO34_KEY_ID_MIN;
if (key_info->key_reference > INCRYPTO34_KEY_ID_MAX)
return SC_ERROR_TOO_MANY_OBJECTS;
key_info->path = df->path;
return 0;
}

View File

@ -142,14 +142,10 @@ static int
muscle_select_key_reference(sc_profile_t *profile, sc_card_t *card,
sc_pkcs15_prkey_info_t *key_info)
{
struct sc_file *df = profile->df_info->file;
if (key_info->key_reference < MUSCLE_KEY_ID_MIN)
key_info->key_reference = MUSCLE_KEY_ID_MIN;
if (key_info->key_reference > MUSCLE_KEY_ID_MAX)
return SC_ERROR_TOO_MANY_OBJECTS;
key_info->path = df->path;
return 0;
}

View File

@ -479,15 +479,11 @@ static int starcos_create_pin(sc_profile_t *profile, sc_card_t *card,
static int starcos_key_reference(sc_profile_t *profile, sc_card_t *card,
sc_pkcs15_prkey_info_t *prkey)
{
struct sc_file *df = profile->df_info->file;
/* use (local) KIDs 0x91-0x9f for private rsa keys */
if (prkey->key_reference < STARCOS_MIN_LPKEY_ID)
prkey->key_reference = STARCOS_MIN_LPKEY_ID;
if (prkey->key_reference > STARCOS_MAX_LPKEY_ID)
return SC_ERROR_TOO_MANY_OBJECTS;
prkey->path = df->path;
return SC_SUCCESS;
}

View File

@ -27,7 +27,7 @@ pkcs15 {
# rfc2459: SHA1(SequenceASN1 of public key components as ASN1 integers)
# native: 'E' + number_of_present_objects_of_the_same_type
# default value: 'native'
# pkcs15-id-style = mozilla;
pkcs15-id-style = mozilla;
}
# Default settings.

View File

@ -79,10 +79,8 @@ filesystem {
template key-domain {
# This is a dummy entry - pkcs15-init insists that
# this is present
EF private-key {
file-id = FFFF;
BSO private-key {
# here ACLs should be defined
}
EF public-key {
file-id = 3003;