From 43be49b4a325964a3ebf510c56b67779f6e13e0c Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 10 Feb 2011 20:31:34 +0000 Subject: [PATCH] libopensc: correct ASN.1 parsing of EF(TokenInfo). Two fields should be optional. This also fixes #322 Thanks to Toni for finding and Andre for fixing the problem. See http://www.opensc-project.org/pipermail/opensc-devel/2011-January/015613.html git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5194 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/pkcs15.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c index 32552aa0..8ca49a01 100644 --- a/src/libopensc/pkcs15.c +++ b/src/libopensc/pkcs15.c @@ -42,8 +42,8 @@ static const struct sc_asn1_entry c_asn1_algorithm_info[7] = { { "algorithmPKCS#11", SC_ASN1_INTEGER, SC_ASN1_TAG_INTEGER, 0, NULL, NULL }, { "parameters", SC_ASN1_NULL, SC_ASN1_TAG_NULL, 0, NULL, NULL }, { "supportedOperations",SC_ASN1_BIT_FIELD, SC_ASN1_TAG_BIT_STRING, 0, NULL, NULL }, - { "objId", SC_ASN1_OBJECT, SC_ASN1_TAG_OBJECT, 0, NULL, NULL }, - { "algRef", SC_ASN1_INTEGER, SC_ASN1_TAG_INTEGER, 0, NULL, NULL }, + { "objId", SC_ASN1_OBJECT, SC_ASN1_TAG_OBJECT, SC_ASN1_OPTIONAL, NULL, NULL }, + { "algRef", SC_ASN1_INTEGER, SC_ASN1_TAG_INTEGER, SC_ASN1_OPTIONAL, NULL, NULL }, { NULL, 0, 0, 0, NULL, NULL } };