Changeset 570 for branches

Timestamp:

10/17/04 21:45:39 (4 years ago)

Author:

aj

Message:

increase reply buffer to 258 bytes
and add proper error handling to ifd-egate.
both by Chaskiel M Grundman.

Location:

branches/openct-0.6/src/ifd

Files:

• ifd-egate.c (modified) (9 diffs)
• process.c (modified) (1 diff)

branches/openct-0.6/src/ifd/ifd-egate.c

@@ -102 +102 @@
         rc = ifd_usb_control(dev, EGATE_DIR_OUT, EGATE_CMD_RESET,
                              0, 0, NULL, 0, EG_TIMEOUT);
-        if (rc < 0)
-                goto failed;
+        if (rc < 0) {
+failed:
+                ct_error("egate: failed to activate token");
+                return IFD_ERROR_COMM_ERROR;
+        }
 
         rc = ifd_usb_control(reader->device, EGATE_DIR_IN, EGATE_CMD_STATUS,
                              0, 0, &stat, 1, EG_TIMEOUT);
         if (rc != 1)
-                return -1;
+                return IFD_ERROR_COMM_ERROR;
 
 
@@ -127 +130 @@
         return atrlen;
 
-failed: ct_error("egate: failed to activate token");
-        return -1;
 }
 
@@ -140 +141 @@
      if (proto != IFD_PROTOCOL_T0 && proto != IFD_PROTOCOL_TRANSPARENT) {
           ct_error("%s: protocol %d not supported", reader->name, proto);
-          return -1;
+          return IFD_ERROR_NOT_SUPPORTED;
      }
      slot = &reader->slot[s];
@@ -147 +148 @@
      if (p == NULL) {
           ct_error("%s: internal error", reader->name);
-          return -1;
+          return IFD_ERROR_GENERIC;
      }
      if (slot->proto) {
@@ -196 +197 @@
                              0, 0, NULL, 0, EG_TIMEOUT);
         if (rc < 0)
-                return -1;
+                return IFD_ERROR_COMM_ERROR;
      }
      if (ifd_iso_apdu_parse(inbuffer, inlen, &iso) < 0) 
-         return -1;
+         return IFD_ERROR_INVALID_ARG;
+     if (inlen < 5 + iso.lc || outlen < 2 + iso.le)
+         return IFD_ERROR_BUFFER_TOO_SMALL;
      memset(cmdbuf,0,5);
      memmove(cmdbuf, inbuffer, inlen < 5 ? inlen : 5);
@@ -205 +208 @@
                         0, 0, (void *) cmdbuf, 5, -1);
      if (rc != 5)
-          return -1;
+          return IFD_ERROR_COMM_ERROR;
      stat=eg_status(reader);
      if (inlen > 5 && stat == EGATE_STATUS_DATA) {
@@ -211 +214 @@
                           0, 0, (void *) (((unsigned char *)inbuffer)+5), iso.lc, -1);
           if (rc < 0)
-               return rc;
+               return IFD_ERROR_COMM_ERROR;
           if (rc != iso.lc) {
                ifd_debug(1, "short USB write (%u of %u bytes)", rc, iso.lc);
-               return -1;
+               return IFD_ERROR_COMM_ERROR;
           }
           ifd_debug(3, "sent %d bytes of data", iso.lc);
@@ -223 +226 @@
                          (void *) outbuffer, iso.le, EG_TIMEOUT);
           if (rc < 0)
-               return rc;
+               return IFD_ERROR_COMM_ERROR;
           if (rc != iso.le) {
                ifd_debug(1, "short USB read (%u of %u bytes)", rc, iso.le);
-               return -1;
+               return IFD_ERROR_COMM_ERROR;
           }
           ifd_debug(3, "received %d bytes of data", iso.le);
@@ -233 +236 @@
        iso.le=0;
      if (stat != EGATE_STATUS_SW)
-          return -1;
+          return IFD_ERROR_DEVICE_DISCONNECTED;
      rc=ifd_usb_control(reader->device, EGATE_DIR_IN, EGATE_CMD_READ, 0, 0,
                     (void *) (((unsigned char *)outbuffer)+iso.le), 2, EG_TIMEOUT);
      if (rc != 2)
-          return -1;
+          return IFD_ERROR_COMM_ERROR;
      ifd_debug(2, "returning a %d byte response", iso.le + 2);
      return iso.le+2;

branches/openct-0.6/src/ifd/process.c

@@ -370 +370 @@
                 ct_tlv_parser_t *args, ct_tlv_builder_t *resp)
 {
-        unsigned char   replybuf[256];
+        unsigned char   replybuf[258];
         unsigned char   *data;
         size_t          data_len;