Changeset 3502

Timestamp:

04/28/08 09:57:03 (4 months ago)

Author:

ludovic.rousseau

Message:

convert C++ in C comment

Location:

trunk/src/libopensc

Files:

• card-akis.c (modified) (2 diffs)
• card-asepcos.c (modified) (2 diffs)
• card-atrust-acos.c (modified) (6 diffs)
• card-incrypto34.c (modified) (1 diff)
• card-muscle.c (modified) (8 diffs)
• card-oberthur.c (modified) (2 diffs)
• card-piv.c (modified) (1 diff)
• card-tcos.c (modified) (1 diff)
• p15card-helper.c (modified) (2 diffs)
• pkcs15-gemsafeV1.c (modified) (1 diff)
• pkcs15-tcos.c (modified) (4 diffs)
• reader-pcsc.c (modified) (1 diff)

trunk/src/libopensc/card-akis.c

@@ -336 +336 @@
 {
         if (data->cmd == SC_PIN_CMD_VERIFY) {
-                // ISO7816 implementation works
+                /* ISO7816 implementation works */
                 return iso_ops->pin_cmd(card, data, tries_left);
         }
 
         if (data->cmd == SC_PIN_CMD_CHANGE) {
-                // This is AKIS specific
+                /* This is AKIS specific */
                 int r;
                 sc_apdu_t apdu;
@@ -527 +527 @@
         akis_ops.match_card = akis_match_card;
         akis_ops.init = akis_init;
-        // read_binary: ISO7816 implementation works
-        // write_binary: ISO7816 implementation works
-        // update_binary: ISO7816 implementation works
-        // erase_binary: Untested
-        // read_record: Untested
-        // write_record: Untested
-        // append_record: Untested
-        // update_record: Untested
+        /* read_binary: ISO7816 implementation works */
+        /* write_binary: ISO7816 implementation works */
+        /* update_binary: ISO7816 implementation works */
+        /* erase_binary: Untested */
+        /* read_record: Untested */
+        /* write_record: Untested */
+        /* append_record: Untested */
+        /* update_record: Untested */
         akis_ops.select_file = akis_select_file;
-        // get_response: ISO7816 implementation works
-        // get_challenge: ISO7816 implementation works
+        /* get_response: ISO7816 implementation works */
+        /* get_challenge: ISO7816 implementation works */
         akis_ops.logout = akis_logout;
-        // restore_security_env: Untested
+        /* restore_security_env: Untested */
         akis_ops.set_security_env = akis_set_security_env;
-        // decipher: Untested
-        // compute_signature: ISO7816 implementation works
+        /* decipher: Untested */
+        /* compute_signature: ISO7816 implementation works */
         akis_ops.create_file = akis_create_file;
         akis_ops.delete_file = akis_delete_file;
         akis_ops.list_files = akis_list_files;
-        // check_sw: ISO7816 implementation works
+        /* check_sw: ISO7816 implementation works */
         akis_ops.card_ctl = akis_card_ctl;
         akis_ops.process_fci = akis_process_fci;
-        // construct_fci: Not needed
+        /* construct_fci: Not needed */
         akis_ops.pin_cmd = akis_pin_cmd;
         akis_ops.get_data = akis_get_data;
-        // put_data: Not implemented
-        // delete_record: Not implemented
+        /* put_data: Not implemented */
+        /* delete_record: Not implemented */
 
         return &akis_drv;

trunk/src/libopensc/card-asepcos.c

@@ -185 +185 @@
                         if (r != SC_SUCCESS)
                                 return r;
-                        tlen += 2 + p[4]; // FIXME
+                        tlen += 2 + p[4]; /* FIXME */
                 } else if (p[3] == 0xAF && len >= 4U + p[4]) {
                         /* TODO: support AND expressions */
@@ -191 +191 @@
                         if (r != SC_SUCCESS)
                                 return r;
-                        tlen += 2 + p[4];       // FIXME
+                        tlen += 2 + p[4];       /* FIXME */
                 } else {
                         sc_error(card->ctx, "invalid security condition");

trunk/src/libopensc/card-atrust-acos.c

@@ -40 +40 @@
 };
 
-// sequence and number has to match atr table !
+/* sequence and number has to match atr table ! */
 static const char *atrust_acos_names[] = {
   ACOS_EMV_A03,
@@ -81 +81 @@
                 if (sc_hex_to_bin(atrp, defatr, &len))
                         continue;
-                // we may only verify part of ATR since
-                // part of the hist chars is variable
+                /* we may only verify part of ATR since */
+                /* part of the hist chars is variable */
                 if (len > card->atr_len)
                         continue;
@@ -156 +156 @@
         if (buflen < 2)
                 return SC_ERROR_INTERNAL;
-        if (buf[0] != 0x6f)                                     // FCI template
+        if (buf[0] != 0x6f)                                     /* FCI template */
                 return SC_ERROR_INVALID_DATA;
         len = (size_t)buf[1];
@@ -170 +170 @@
         file->size = 0;
   
-        // get file size
+        /* get file size */
         tag = sc_asn1_find_tag(ctx, p, len, 0x80, &taglen);
         if (tag != NULL && taglen >= 2) {
@@ -179 +179 @@
         }
 
-        // get file type
+        /* get file type */
         tag = sc_asn1_find_tag(ctx, p, len, 0x82, &taglen);
         if (tag != NULL) {
@@ -822 +822 @@
         }
   
-        // iso error 
+        /* iso error */
         return iso_ops->check_sw(card, sw1, sw2);
 }

trunk/src/libopensc/card-incrypto34.c

@@ -196 +196 @@
         SC_TEST_RET(card->ctx, r, "APDU transmit failed");
         if (apdu.sw1 == 0x6a && apdu.sw2 == 0x82)
-                goto end; // no more files
+                goto end; /* no more files */
 
         r = sc_check_sw(card, apdu.sw1, apdu.sw2);

trunk/src/libopensc/card-muscle.c

@@ -179 +179 @@
         file = &fs->cache.array[fs->currentFileIndex];
         objectId = file->objectId;
-//      memcpy(objectId.id, file->objectId.id, 4);
+        /* memcpy(objectId.id, file->objectId.id, 4); */
         if(!file->ef) {
                 oid[0] = oid[2];
@@ -202 +202 @@
         
         objectId = file->objectId;
-        //memcpy(objectId.id, file->objectId.id, 4);
+        /* memcpy(objectId.id, file->objectId.id, 4); */
         if(!file->ef) {
                 oid[0] = oid[2];
@@ -230 +230 @@
                 r = msc_update_object(card, objectId, idx, buf, count);
         }
-        //mscfs_clear_cache(fs);
+        /* mscfs_clear_cache(fs); */
         return r;
 }
@@ -269 +269 @@
                 oid[1] = oid[3];
                 oid[2] = oid[3] = 0;
-                // ??? objectId = objectId >> 16;
+                /* ??? objectId = objectId >> 16; */
         }
         if((0 == memcmp(oid, "\x3F\x00\x00\x00", 4))
@@ -308 +308 @@
 {
         int key;
-        // Everybody by default....
+        /* Everybody by default.... */
         sc_file_add_acl_entry(file, operation, SC_AC_NONE, 0);
         if(acl == 0xFFFF) {
@@ -585 +585 @@
         /* CURRENTLY DONT SUPPOT EXTRACTING PRIVATE KEYS... */
         switch(info->keyType) {
-        case 1: // RSA
+        case 1: /* RSA */
                 return msc_extract_rsa_public_key(card, 
                         info->keyLocation, 
@@ -601 +601 @@
         /* CURRENTLY DONT SUPPOT EXTRACTING PRIVATE KEYS... */
         switch(info->keyType) {
-        case 0x02: // RSA_PRIVATE
-        case 0x03: // RSA_PRIVATE_CRT
+        case 0x02: /* RSA_PRIVATE */
+        case 0x03: /* RSA_PRIVATE_CRT */
                 return msc_import_key(card, 
                         info->keyLocation, 
@@ -676 +676 @@
                 return SC_ERROR_NOT_SUPPORTED;
         }
-        //if (env->flags & SC_SEC_ENV_FILE_REF_PRESENT)
-        //      if (memcmp(env->file_ref.value, "\x00\x12", 2) != 0) {
-        //              sc_error(card->ctx, "File reference is not 0012.\n");
-        //              return SC_ERROR_NOT_SUPPORTED;
-        //      }
+        /* if (env->flags & SC_SEC_ENV_FILE_REF_PRESENT)
+                if (memcmp(env->file_ref.value, "\x00\x12", 2) != 0) {
+                        sc_error(card->ctx, "File reference is not 0012.\n");
+                        return SC_ERROR_NOT_SUPPORTED;
+                } */
         priv->env = *env;
         return 0;

trunk/src/libopensc/card-oberthur.c

@@ -182 +182 @@
         sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT, 0xA4, 0x04, 0x0C);
         apdu.lc = sizeof(cm);
-//      apdu.le = sizeof(cm)+4;
+        /* apdu.le = sizeof(cm)+4; */
         apdu.le = 0;
         apdu.data = cm;
@@ -2058 +2058 @@
                         auth_current_ef->magic, auth_current_ef->ef_structure);
 
-//      _auth_print_acls(card, auth_current_ef);
+/*      _auth_print_acls(card, auth_current_ef); */
 
 #ifndef NOT_YET 

trunk/src/libopensc/card-piv.c

@@ -1717 +1717 @@
         priv->selected_obj = -1;
         priv->max_recv_size = 256;
-        //priv->max_recv_size = card->max_recv_size;
+        /* priv->max_recv_size = card->max_recv_size; */
         priv->max_send_size = card->max_send_size;
         card->max_recv_size = 0xffff; /* must force pkcs15 read_binary in one call */

trunk/src/libopensc/card-tcos.c

@@ -521 +521 @@
                 else sc_debug(ctx, "Key-Reference %02X (len=%d)\n", env->key_ref[0], env->key_ref_len);
         }
-        // Key-Reference 0x80 ??
+        /* Key-Reference 0x80 ?? */
         default_key= !(env->flags & SC_SEC_ENV_KEY_REF_PRESENT) || (env->key_ref_len==1 && env->key_ref[0]==0x80);
         if(ctx->debug>=3){

trunk/src/libopensc/p15card-helper.c

@@ -133 +133 @@
 }
 
-//int default_cert_handle(sc_pkcs15_card_t *p15card, p15data_items* items, cdata* cert, u8* data, size_t length) {
+/* int default_cert_handle(sc_pkcs15_card_t *p15card, p15data_items* items, cdata* cert, u8* data, size_t length) { */
 CERT_HANDLE_FUNCTION(default_cert_handle) {
         /* Certificate data exists, parse it */
@@ -171 +171 @@
         
         modulus_len = 8 * BN_num_bytes(pkey->pkey.rsa->n); /* converting to bits */
-        //printf("Key Size: %d bits\n\n", modulus_len);
-        //cached_cert->modulusLength = modulus_len;
+        /* printf("Key Size: %d bits\n\n", modulus_len); */
+        /* cached_cert->modulusLength = modulus_len; */
         
         if(key->label) {

trunk/src/libopensc/pkcs15-gemsafeV1.c

@@ -494 +494 @@
 #endif
 
-//SC_IMPLEMENT_DRIVER_VERSION("0.9.4")
+/* SC_IMPLEMENT_DRIVER_VERSION("0.9.4") */

trunk/src/libopensc/pkcs15-tcos.c

@@ -65 +65 @@
         }
 
-        // some certificates are prefixed by an OID
+        /* some certificates are prefixed by an OID */
         if(cert[4]==0x06 && cert[5]<10 && cert[6+cert[5]]==0x30 && cert[7+cert[5]]==0x82){
                 cert_info.path.index=6+cert[5];
@@ -255 +255 @@
         char dir[10], *c_auth;
 
-        // NKS-Applikation ?
+        /* NKS-Applikation ? */
         p.len=7; p.type=SC_PATH_TYPE_DF_NAME;
         memcpy(p.value, "\xD2\x76\x00\x00\x03\x01\x02", p.len=7);
@@ -307 +307 @@
         );
 
-        // SigG-Applikation ?
+        /* SigG-Applikation ? */
         p.len=7; p.type=SC_PATH_TYPE_DF_NAME;
         memcpy(p.value, "\xD2\x76\x00\x00\x66\x01", p.len=6);
@@ -438 +438 @@
         int i, r;
 
-        // check if we have the correct card OS unless SC_PKCS15EMU_FLAGS_NO_CHECK
+        /* check if we have the correct card OS unless SC_PKCS15EMU_FLAGS_NO_CHECK */
         i=(opts && (opts->flags & SC_PKCS15EMU_FLAGS_NO_CHECK));
         if (!i && card->type!=SC_CARD_TYPE_TCOS_V2 && card->type!=SC_CARD_TYPE_TCOS_V3) return SC_ERROR_WRONG_CARD;
 
-        // get the card serial number
+        /* get the card serial number */
         r = sc_card_ctl(card, SC_CARDCTL_GET_SERIALNR, &serialnr);
         if (r < 0) {

trunk/src/libopensc/reader-pcsc.c

@@ -1206 +1206 @@
 
         SC_TEST_RET(reader->ctx, r, "Part 10: block transmit failed!");
-        // finish the call if it was a two-phase operation
+        /* finish the call if it was a two-phase operation */
         if ((ioctl == pslot->verify_ioctl_start)
             || (ioctl == pslot->modify_ioctl_start)) {