diff --git a/src/pkcs15init/entersafe.profile b/src/pkcs15init/entersafe.profile index e7b6c4d0..36271590 100644 --- a/src/pkcs15init/entersafe.profile +++ b/src/pkcs15init/entersafe.profile @@ -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; diff --git a/src/pkcs15init/incrypto34.profile b/src/pkcs15init/incrypto34.profile index 13a27c67..567ff92d 100644 --- a/src/pkcs15init/incrypto34.profile +++ b/src/pkcs15init/incrypto34.profile @@ -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; diff --git a/src/pkcs15init/muscle.profile b/src/pkcs15init/muscle.profile index 4e2ca7fb..34a952b0 100644 --- a/src/pkcs15init/muscle.profile +++ b/src/pkcs15init/muscle.profile @@ -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; diff --git a/src/pkcs15init/pkcs15-entersafe.c b/src/pkcs15init/pkcs15-entersafe.c index 070e7c8d..dc83833a 100644 --- a/src/pkcs15init/pkcs15-entersafe.c +++ b/src/pkcs15init/pkcs15-entersafe.c @@ -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); } diff --git a/src/pkcs15init/pkcs15-incrypto34.c b/src/pkcs15init/pkcs15-incrypto34.c index f986e1b7..718ecd60 100644 --- a/src/pkcs15init/pkcs15-incrypto34.c +++ b/src/pkcs15init/pkcs15-incrypto34.c @@ -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; } diff --git a/src/pkcs15init/pkcs15-muscle.c b/src/pkcs15init/pkcs15-muscle.c index 9c518ae9..bcf5d612 100644 --- a/src/pkcs15init/pkcs15-muscle.c +++ b/src/pkcs15init/pkcs15-muscle.c @@ -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; } diff --git a/src/pkcs15init/pkcs15-starcos.c b/src/pkcs15init/pkcs15-starcos.c index c3f57440..0fd3f66e 100644 --- a/src/pkcs15init/pkcs15-starcos.c +++ b/src/pkcs15init/pkcs15-starcos.c @@ -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; } diff --git a/src/pkcs15init/pkcs15.profile b/src/pkcs15init/pkcs15.profile index 308dcc69..18e188e7 100644 --- a/src/pkcs15init/pkcs15.profile +++ b/src/pkcs15init/pkcs15.profile @@ -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. diff --git a/src/pkcs15init/starcos.profile b/src/pkcs15init/starcos.profile index 78081746..af4d6174 100644 --- a/src/pkcs15init/starcos.profile +++ b/src/pkcs15init/starcos.profile @@ -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;