From b271321d91292b646f34bf12aefa50b5e4996354 Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Thu, 26 Jun 2014 07:30:35 +0200 Subject: [PATCH] fixed parsing of EF.CardAccess and Certificate Description --- npa/src/boxing.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/npa/src/boxing.c b/npa/src/boxing.c index b51dd50..64fe85d 100644 --- a/npa/src/boxing.c +++ b/npa/src/boxing.c @@ -56,12 +56,12 @@ static const u8 boxing_p2_PC_to_RDR_Secure = 0x10; struct sc_asn1_entry g_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 } }; struct sc_asn1_entry g_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 } }; struct sc_asn1_entry g_octet_string[] = { @@ -84,7 +84,7 @@ static const struct sc_asn1_entry g_EstablishPACEChannelInput_data[] = { { "cHAT", SC_ASN1_STRUCT, SC_ASN1_CTX|0x03|SC_ASN1_CONS, SC_ASN1_OPTIONAL|SC_ASN1_ALLOC, NULL, NULL }, { "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", /* 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 }, @@ -96,7 +96,7 @@ static const struct sc_asn1_entry g_EstablishPACEChannelOutput_data[] = { { "statusMSESetAT", SC_ASN1_STRUCT, SC_ASN1_CTX|0x02|SC_ASN1_CONS, 0, NULL, NULL }, { "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", SC_ASN1_STRUCT, SC_ASN1_CTX|0x04|SC_ASN1_CONS, SC_ASN1_OPTIONAL|SC_ASN1_ALLOC, NULL, NULL }, { "curCAR",