Changeset 3277 for trunk/src/libopensc/card-asepcos.c

Timestamp:

09/29/07 07:43:25 (16 months ago)

Author:

nils

Message:

ignore paths with a AID in it

Files:

• trunk/src/libopensc/card-asepcos.c (modified) (2 diffs)

trunk/src/libopensc/card-asepcos.c

@@ -213 +213 @@
 
         while (len != 0) {
-                if (len < 4 || in[0] != 0x8b || in[1] != 0x02)
+                if (len < 4)
                         return SC_ERROR_INTERNAL;
+                if (in[0] != 0x8b || in[1] != 0x02)
+                        return SC_ERROR_INVALID_ASN1_OBJECT;
                 /* append file id to the path */
                 r = sc_append_path_id(out, &in[2], 2);
@@ -269 +271 @@
 
                 r = asepcos_get_current_df_path(card, &tpath);
-                if (r != SC_SUCCESS)
-                        return r;
-                if (sc_compare_path_prefix(&tpath, &npath) != 0) {
+                /* workaround: as opensc can't handle paths with file id
+                 * and application names in it let's ignore the current
+                 * DF if the returned path contains a unsupported tag.
+                 */
+                if (r != SC_ERROR_INVALID_ASN1_OBJECT && r != SC_SUCCESS)
+                        return r;
+                if (r == SC_SUCCESS && sc_compare_path_prefix(&tpath, &npath) != 0) {
                         /* remove the currently selected DF from the path */
                         if (tpath.len == npath.len) {