Changeset 3028

Timestamp:

09/26/06 10:55:02 (2 years ago)

Author:

henryk

Message:

Make absolute paths from all paths read from the PKCS#15 directories by prepending the DF(PKCS#15) path if necessary.
Fixes compatibility with Siemens HiPath? SIcurity formatted cards which use relative paths.

Location:

trunk/src/libopensc

Files:

• pkcs15-cert.c (modified) (1 diff)
• pkcs15-data.c (modified) (1 diff)
• pkcs15-prkey.c (modified) (1 diff)
• pkcs15-pubkey.c (modified) (1 diff)
• pkcs15.c (modified) (7 diffs)
• pkcs15.h (modified) (1 diff)

trunk/src/libopensc/pkcs15-cert.c

@@ -219 +219 @@
                 return r;
         SC_TEST_RET(ctx, r, "ASN.1 decoding failed");
+        r = sc_pkcs15_make_absolute_path(&p15card->file_app->path, &info.path);
+        if (r < 0)
+                return r;
         obj->type = SC_PKCS15_TYPE_CERT_X509;
         obj->data = malloc(sizeof(info));

trunk/src/libopensc/pkcs15-data.c

@@ -110 +110 @@
         if (r == SC_ERROR_ASN1_END_OF_CONTENTS)
                 return r;
-
         SC_TEST_RET(ctx, r, "ASN.1 decoding failed");
+        r = sc_pkcs15_make_absolute_path(&p15card->file_app->path, &info.path);
+        if (r < 0)
+                return r;
         obj->type = SC_PKCS15_TYPE_DATA_OBJECT;
         obj->data = malloc(sizeof(info));

trunk/src/libopensc/pkcs15-prkey.c

@@ -154 +154 @@
                 SC_FUNC_RETURN(ctx, 0, SC_ERROR_INVALID_ASN1_OBJECT);
         }
+        r = sc_pkcs15_make_absolute_path(&p15card->file_app->path, &info.path);
+        if (r < 0)
+                return r;
         obj->data = malloc(sizeof(info));
         if (obj->data == NULL)

trunk/src/libopensc/pkcs15-pubkey.c

@@ -136 +136 @@
                 obj->type = SC_PKCS15_TYPE_PUBKEY_DSA;
         }
+        r = sc_pkcs15_make_absolute_path(&p15card->file_app->path, &info.path);
+        if (r < 0)
+                return r;
         obj->data = malloc(sizeof(info));
         if (obj->data == NULL)

trunk/src/libopensc/pkcs15.c

@@ -314 +314 @@
         const u8 *p = buf;
         size_t left = buflen;
-        int r, i;
+        int r, i, type;
         sc_path_t path;
         struct sc_asn1_entry asn1_obj_or_path[] = {
@@ -331 +331 @@
                 if (r < 0)
                         return r;
-                r = sc_pkcs15_add_df(card, odf_indexes[r], &path, NULL);
+                type = r;
+                r = sc_pkcs15_make_absolute_path(&card->file_app->path, &path);
+                if (r < 0)
+                        return r;
+                r = sc_pkcs15_add_df(card, odf_indexes[type], &path, NULL);
                 if (r)
                         return r;
@@ -1534 +1538 @@
                         return r;
                 /* If the path length is 0, it's a dummy path then don't add it.
-                 * If the path length isn't include (-1) then it's against the standard
+                 * If the path length isn't included (-1) then it's against the standard
                  *   but we'll just ignore it instead of returning an error. */
                 if (path.count > 0) {
+                        r = sc_pkcs15_make_absolute_path(&card->file_app->path, &path);
+                        if (r < 0)
+                                return r;
                         r = sc_pkcs15_add_unusedspace(card, &path, &auth_id);
                         if (r)
@@ -1554 +1561 @@
 {
         sc_file_t *file = NULL;
-        sc_path_t tmp_path, *path = &tmp_path;
         u8      *data = NULL;
         size_t  len = 0, offset = 0;
@@ -1572 +1578 @@
         }
 
-        if (in_path->type == SC_PATH_TYPE_FILE_ID) {
-                /* in case of a FID prepend the application DF */
-                memcpy(path, &p15card->file_app->path, sizeof(sc_path_t));
-                sc_append_path(path, in_path);
-                path->index = in_path->index;
-                path->count = in_path->count;
-        } else {
-                memcpy(path, in_path, sizeof(sc_path_t));
-        }
         r = -1; /* file state: not in cache */
         if (p15card->opts.use_cache) {
-                r = sc_pkcs15_read_cached_file(p15card, path, &data, &len);
+                r = sc_pkcs15_read_cached_file(p15card, in_path, &data, &len);
         }
         if (r) {
                 r = sc_lock(p15card->card);
                 SC_TEST_RET(p15card->card->ctx, r, "sc_lock() failed");
-                r = sc_select_file(p15card->card, path, &file);
+                r = sc_select_file(p15card->card, in_path, &file);
                 if (r)
                         goto fail_unlock;
@@ -1594 +1591 @@
                 /* Handle the case where the ASN.1 Path object specified
                  * index and length values */
-                if (path->count < 0) {
+                if (in_path->count < 0) {
                         len = file->size;
                         offset = 0;
                 } else {
-                        offset = path->index;
-                        len = path->count;
+                        offset = in_path->index;
+                        len = in_path->count;
                         /* Make sure we're within proper bounds */
                         if (offset >= file->size
@@ -1714 +1711 @@
         return sc_hex_to_bin(in, out->value, &out->len);
 }
+
+int sc_pkcs15_make_absolute_path(const sc_path_t *parent, sc_path_t *child)
+{
+        if (sc_compare_path_prefix(sc_get_mf_path(), child))
+                return 0;
+        return sc_concatenate_path(child, parent, child);
+}

trunk/src/libopensc/pkcs15.h

@@ -633 +633 @@
 void sc_der_copy(sc_pkcs15_der_t *, const sc_pkcs15_der_t *);
 void sc_der_clear(sc_pkcs15_der_t *);
+/* Prepend 'parent' to 'child' in case 'child' is a relative path */
+int sc_pkcs15_make_absolute_path(const sc_path_t *parent, sc_path_t *child);
 
 /* New object search API.