Changeset 3152 for releases

Timestamp:

04/23/07 19:19:31 (21 months ago)

Author:

nils

Message:

authenticate if data object is protected

Files:

• releases/opensc-0.11.2/src/tools/pkcs15-tool.c (modified) (4 diffs)

releases/opensc-0.11.2/src/tools/pkcs15-tool.c

@@ -325 +325 @@
                 if (verbose)
                         printf("Reading data object with label '%s'\n", opt_data);
-                r = sc_pkcs15_read_data_object(p15card, cinfo, &data_object);
-                if (r) {
-                        fprintf(stderr, "Data object read failed: %s\n", sc_strerror(r));
-                        if (r == SC_ERROR_FILE_NOT_FOUND)
-                                continue; /* DEE emulation may say there is a file */
+                r = authenticate(objs[i]);
+                if (r >= 0) {
+                        r = sc_pkcs15_read_data_object(p15card, cinfo, &data_object);
+                        if (r) {
+                                fprintf(stderr, "Data object read failed: %s\n", sc_strerror(r));
+                                if (r == SC_ERROR_FILE_NOT_FOUND)
+                                        continue; /* DEE emulation may say there is a file */
+                                return 1;
+                        }
+                        r = print_data_object("Data Object", data_object->data, data_object->data_len);
+                        sc_pkcs15_free_data_object(data_object);
+                        return r;
+                } else {
+                        fprintf(stderr, "Authentication error: %s\n", sc_strerror(r));
                         return 1;
                 }
-                r = print_data_object("Data Object", data_object->data, data_object->data_len);
-                sc_pkcs15_free_data_object(data_object);
-                return r;
         }
         fprintf(stderr, "Data object with label '%s' not found.\n", opt_data);
@@ -354 +360 @@
                 int idx;
                 struct sc_pkcs15_data_info *cinfo = (struct sc_pkcs15_data_info *) objs[i]->data;
-                struct sc_pkcs15_data *data_object;
 
                 printf("Reading data object <%i>\n", i);
@@ -370 +375 @@
                 } else
                         printf("NONE\n");
-                printf("Path :           %s\n", sc_print_path(&cinfo->path));
-                r = sc_pkcs15_read_data_object(p15card, cinfo, &data_object);
-                if (r) {
-                        fprintf(stderr, "Data object read failed: %s\n", sc_strerror(r));
-                        if (r == SC_ERROR_FILE_NOT_FOUND)
-                                 continue; /* DEE emulation may say there is a file */
-                        return 1;
-                }
-                r = list_data_object("Data Object", data_object->data, data_object->data_len);
-                sc_pkcs15_free_data_object(data_object);
+                printf("Path:            %s\n", sc_print_path(&cinfo->path));
+                printf("Auth ID:         %s\n", sc_pkcs15_print_id(&objs[i]->auth_id));
+                if (objs[i]->auth_id.len == 0) {
+                        struct sc_pkcs15_data *data_object;
+                        r = sc_pkcs15_read_data_object(p15card, cinfo, &data_object);
+                        if (r) {
+                                fprintf(stderr, "Data object read failed: %s\n", sc_strerror(r));
+                                if (r == SC_ERROR_FILE_NOT_FOUND)
+                                         continue; /* DEE emulation may say there is a file */
+                                return 1;
+                        }
+                        r = list_data_object("Data Object", data_object->data, data_object->data_len);
+                        sc_pkcs15_free_data_object(data_object);
+                }
         }
         return 0;
@@ -855 +864 @@
 
         pin_info = (sc_pkcs15_pin_info_t *) pin_obj->data;
-        pin = get_pin("Please enter PIN", pin_obj);
+        if (opt_pin != NULL)
+                pin = opt_pin;
+        else
+                pin = get_pin("Please enter PIN", pin_obj);
 
         return sc_pkcs15_verify_pin(p15card, pin_info,