Fixed handling of pkcs15 types and added support for storing pkcs15 data objects

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2335 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
sth 2005-05-06 11:31:59 +00:00
parent 14e03407c1
commit f6712b8736
2 changed files with 4 additions and 7 deletions

View File

@ -279,15 +279,13 @@ setcos_new_file(sc_profile_t *profile, sc_card_t *card,
sc_path_t *p;
char name[64], *tag;
if ((type & SC_PKCS15_TYPE_PRKEY_RSA) == SC_PKCS15_TYPE_PRKEY_RSA)
if (type == SC_PKCS15_TYPE_PRKEY_RSA)
tag = "private-key";
else if ((type & SC_PKCS15_TYPE_PRKEY) == SC_PKCS15_TYPE_PRKEY)
tag = "extractable-key";
else if ((type & SC_PKCS15_TYPE_PUBKEY_RSA) == SC_PKCS15_TYPE_PUBKEY_RSA)
else if (type == SC_PKCS15_TYPE_PUBKEY_RSA)
tag = "public-key";
else if ((type & SC_PKCS15_TYPE_CERT) == SC_PKCS15_TYPE_CERT)
else if ((type & SC_PKCS15_TYPE_CLASS_MASK) == SC_PKCS15_TYPE_CERT)
tag = "certificate";
else if ((type & SC_PKCS15_TYPE_DATA_OBJECT) == SC_PKCS15_TYPE_DATA_OBJECT)
else if ((type & SC_PKCS15_TYPE_CLASS_MASK) == SC_PKCS15_TYPE_DATA_OBJECT)
tag = "data";
else {
sc_error(card->ctx, "Unsupported file type");

View File

@ -90,7 +90,6 @@ filesystem {
EF template-data {
file-id = 5000;
structure = transparent;
size = 1000;
ACL = *=$SOPIN, *=NONE;
}
}