VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fixed parsing of EF.CardAccess and Certificate Description

Browse Source
This commit is contained in:
Frank Morgner
2014-06-26 07:30:35 +02:00
parent 36aa547902
commit b271321d91
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
npa/src/boxing.c
View File

@@ -56,12 +56,12 @@ static const u8 boxing_p2_PC_to_RDR_Secure = 0x10;
struct sc_asn1_entry g_boolean[] = { struct sc_asn1_entry g_boolean[] = {
{ "boolean", { "boolean",
SC_ASN1_BOOLEAN, SC_ASN1_TAG_BOOLEAN, SC_ASN1_ALLOC, NULL, NULL }, SC_ASN1_BOOLEAN, SC_ASN1_TAG_BOOLEAN, 0, NULL, NULL },
{ NULL , 0 , 0 , 0 , NULL , NULL } { NULL , 0 , 0 , 0 , NULL , NULL }
}; };
struct sc_asn1_entry g_int_as_octet_string[] = { struct sc_asn1_entry g_int_as_octet_string[] = {
{ "int as octet string", { "int as octet string",
SC_ASN1_OCTET_STRING, SC_ASN1_TAG_INTEGER, SC_ASN1_ALLOC, NULL, NULL }, SC_ASN1_OCTET_STRING, SC_ASN1_TAG_INTEGER, 0, NULL, NULL },
{ NULL , 0 , 0 , 0 , NULL , NULL } { NULL , 0 , 0 , 0 , NULL , NULL }
}; };
struct sc_asn1_entry g_octet_string[] = { struct sc_asn1_entry g_octet_string[] = {
@@ -84,7 +84,7 @@ static const struct sc_asn1_entry g_EstablishPACEChannelInput_data[] = {
{ "cHAT", { "cHAT",
SC_ASN1_STRUCT, SC_ASN1_CTX|0x03|SC_ASN1_CONS, SC_ASN1_OPTIONAL|SC_ASN1_ALLOC, NULL, NULL }, SC_ASN1_STRUCT, SC_ASN1_CTX|0x03|SC_ASN1_CONS, SC_ASN1_OPTIONAL|SC_ASN1_ALLOC, NULL, NULL },
{ "certificateDescription", { "certificateDescription",
SC_ASN1_STRUCT, SC_ASN1_CTX|0x04|SC_ASN1_CONS, SC_ASN1_OPTIONAL|SC_ASN1_ALLOC, NULL, NULL }, SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x04|SC_ASN1_CONS, SC_ASN1_OPTIONAL|SC_ASN1_ALLOC, NULL, NULL },
{ "hashOID", { "hashOID",
/* use an OCTET STRING to avoid a conversion to struct sc_object_id */ /* use an OCTET STRING to avoid a conversion to struct sc_object_id */
SC_ASN1_STRUCT, SC_ASN1_CTX|0x05|SC_ASN1_CONS, SC_ASN1_OPTIONAL|SC_ASN1_ALLOC, NULL, NULL }, SC_ASN1_STRUCT, SC_ASN1_CTX|0x05|SC_ASN1_CONS, SC_ASN1_OPTIONAL|SC_ASN1_ALLOC, NULL, NULL },
@@ -96,7 +96,7 @@ static const struct sc_asn1_entry g_EstablishPACEChannelOutput_data[] = {
{ "statusMSESetAT", { "statusMSESetAT",
SC_ASN1_STRUCT, SC_ASN1_CTX|0x02|SC_ASN1_CONS, 0, NULL, NULL }, SC_ASN1_STRUCT, SC_ASN1_CTX|0x02|SC_ASN1_CONS, 0, NULL, NULL },
{ "efCardAccess", { "efCardAccess",
SC_ASN1_STRUCT, SC_ASN1_CTX|0x03|SC_ASN1_CONS, SC_ASN1_ALLOC, NULL, NULL }, SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x03|SC_ASN1_CONS, SC_ASN1_ALLOC, NULL, NULL },
{ "idPICC", { "idPICC",
SC_ASN1_STRUCT, SC_ASN1_CTX|0x04|SC_ASN1_CONS, SC_ASN1_OPTIONAL|SC_ASN1_ALLOC, NULL, NULL }, SC_ASN1_STRUCT, SC_ASN1_CTX|0x04|SC_ASN1_CONS, SC_ASN1_OPTIONAL|SC_ASN1_ALLOC, NULL, NULL },
{ "curCAR", { "curCAR",