Changeset 3478 for trunk/src/libopensc/pkcs15-rutoken.c

Timestamp:

04/18/08 14:08:23 (9 months ago)

Author:

alonbl

Message:

ruToken fixups

http://www.opensc-project.org/pipermail/opensc-devel/2008-April/011057.html

By Aktiv Co. Aleksey Samsonov

Files:

• trunk/src/libopensc/pkcs15-rutoken.c (modified) (12 diffs)

trunk/src/libopensc/pkcs15-rutoken.c

@@ -1 +1 @@
 /*
- * PKCS15 emulation layer for ruToken
+ * PKCS15 emulation layer for Rutoken
  *
  * Copyright (C) 2007  Pavel Mironchik <rutoken@rutoken.ru>
@@ -29 +29 @@
 #include <stdarg.h>
 #include <opensc/opensc.h>
-#include "cardctl.h"
 #include <opensc/log.h>
 #include <opensc/pkcs15.h>
-
-#define RUT_LABEL    "ruToken card"
+#include "cardctl.h"
 
 #define PrKDF_path      "3F00FF000001"
@@ -39 +37 @@
 #define CDF_path        "3F00FF000003"
 #define DODF_path       "3F00FF000004"
-#define AODF_path       "3F00FF00A0DF"
+#define AODF_path       "3F00FF000000"
 
 static const struct
@@ -83 +81 @@
                         free(pin_info);
                         free(pin_obj);
-                return SC_ERROR_OUT_OF_MEMORY;
-        }
+                        return SC_ERROR_OUT_OF_MEMORY;
+                }
                 pin_info->auth_id.len      = 1;
                 pin_info->auth_id.value[0] = (u8)pinlist[i].reference;
@@ -98 +96 @@
 
                 strncpy(pin_obj->label, pinlist[i].label, SC_PKCS15_MAX_LABEL_SIZE - 1);
-                pin_obj->flags            = SC_PKCS15_CO_FLAG_PRIVATE;
-                
+                pin_obj->flags = SC_PKCS15_CO_FLAG_PRIVATE;
                 sc_pkcs15emu_add_pin_obj(p15card, pin_obj, pin_info);
                 free(pin_obj);
@@ -120 +117 @@
         char               serial[30] = {0};
         u8                 info[8];
-        
+
         /*  get the card serial number   */
         if (sc_card_ctl(card, SC_CARDCTL_GET_SERIALNR, &serialnr) < 0) 
@@ -129 +126 @@
         sc_bin_to_hex(serialnr.value, serialnr.len , serial, sizeof(serial), 0);
         set_string(&p15card->serial_number, serial);
-        
         /*  get ruToken information  */
         if (sc_card_ctl(card, SC_CARDCTL_RUTOKEN_GET_INFO, info) < 0) 
@@ -136 +132 @@
                 return SC_ERROR_WRONG_CARD;
         }
-        set_string(&p15card->label, RUT_LABEL);
+        set_string(&p15card->label, card->name);
         p15card->version = (info[1] >> 4)*10 + (info[1] & 0x0f);
         sc_bin_to_hex(info + 3, 3 , serial, sizeof(serial), 0);
         set_string(&p15card->manufacturer_id, serial);
-        
         return SC_SUCCESS;
 }
-        
+
 static int sc_pkcs15_rutoken_init_func(sc_pkcs15_card_t *p15card)
 {
@@ -153 +148 @@
         int r;
         unsigned int added_pin = 0;
-        
+
         if (!p15card || !p15card->card || !p15card->card->ctx
                         || !p15card->card->ops
@@ -159 +154 @@
         )
                 return SC_ERROR_INVALID_ARGUMENTS;
-        
         card = p15card->card;
         ctx = card->ctx;
-        
         r = set_card_info(p15card);
         if (r != SC_SUCCESS)
-                {
+        {
                 sc_error(ctx, "Unable to set card info: %s\n", sc_strerror(r));
                 r = SC_SUCCESS;
-                }
+        }
 
         for (i = 0; i < sizeof(arr_profile_df)/sizeof(arr_profile_df[0]); ++i)
-                {
+        {
                 df = NULL;
                 sc_format_path(arr_profile_df[i].path, &path);
@@ -182 +175 @@
                         r = sc_pkcs15_add_df(p15card, arr_profile_df[i].type, &path, df);
                 if (df)
-                sc_file_free(df);
+                        sc_file_free(df);
 
                 if (r != SC_SUCCESS) break;
@@ -200 +193 @@
 }
 
-int sc_pkcs15emu_rutoken_init_ex(sc_pkcs15_card_t *p15card,
-                                                                 sc_pkcs15emu_opt_t *opts)
+int sc_pkcs15emu_rutoken_init_ex(sc_pkcs15_card_t *p15card, 
+                sc_pkcs15emu_opt_t *opts)
 {
         struct sc_card *card = p15card->card;
-        
+
         SC_FUNC_CALLED(card->ctx, 1);
-        
         /* check if we have the correct card OS */
-        if (strcmp(card->name, "rutoken card"))
+        if (strcmp(card->name, "Rutoken card"))
                 return SC_ERROR_WRONG_CARD;
-        
         sc_debug(card->ctx, "%s found", card->name);
         return sc_pkcs15_rutoken_init_func(p15card);
 }
+