Changeset aae5b93 in OpenSC

Timestamp:

12/21/11 09:26:23 (5 months ago)

Author:

Xiaoshuo

Children:

f0bde7d

Parents:

4251a23

git-author:

Xiaoshuo <xiaoshuo@…> (12/21/11 09:26:23)

git-committer:

Xiaoshuo <xiaoshuo@…> (12/21/11 09:26:23)

Message:

Implement SM by adding sm_wrap_apdu/sm_unwrap_apdu hooks.

Location:

src/libopensc

Files:

• apdu.c (modified) (2 diffs)
• card-entersafe.c (modified) (1 diff)
• card-epass2003.c (modified) (2 diffs)
• iso7816.c (modified) (1 diff)
• opensc.h (modified) (2 diffs)

src/libopensc/apdu.c

@@ -516 +516 @@
 }
 
-int sc_transmit_apdu(sc_card_t *card, sc_apdu_t *apdu)
+static int _sc_transmit_apdu(sc_card_t *card, sc_apdu_t *apdu)
 {
         int r = SC_SUCCESS;
@@ -606 +606 @@
                 sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "sc_unlock failed");
 
+        return r;
+}
+
+/*
+ * Wrap/Unwrap APDU when requested before sending to reader driver
+ * Needed (un)wrapping apdu is noticed by a non-null
+ * card->ops->(un)wrap_apdu() function pointer
+ * (eg: for Secure Messaging)
+ *  @param  card  sc_card_t object for the smartcard
+ *  @param  apdu  APDU to be sent
+ *  @return SC_SUCCESS on success and an error value otherwise
+ */
+int sc_transmit_apdu(sc_card_t *card, sc_apdu_t *apdu) {
+        int r;
+        sc_context_t *ctx = card->ctx;
+
+        if (ctx->use_sm != 0) {
+                //construct new SM apdu from original apdu
+                u8 data[SC_MAX_EXT_APDU_BUFFER_SIZE] = {0};
+                u8 resp[SC_MAX_EXT_APDU_BUFFER_SIZE] = {0};
+                sc_apdu_t wrapped_apdu;
+                wrapped_apdu.data = &data[0];
+                wrapped_apdu.datalen = SC_MAX_EXT_APDU_BUFFER_SIZE;
+                wrapped_apdu.resp = &resp[0];
+                wrapped_apdu.resplen = SC_MAX_EXT_APDU_BUFFER_SIZE;
+
+                /* wrap apdu */
+                r = card->ops->sm_wrap_apdu(card, apdu, &wrapped_apdu);
+                SC_TEST_RET(ctx, SC_LOG_DEBUG_NORMAL, r, "sm_wrap_apdu error");
+
+                /* determine the APDU type if necessary, i.e. to use
+                 * short or extended APDUs  */
+                sc_detect_apdu_cse(card, apdu);
+
+                /* check wrapped apdu */
+                r = sc_check_apdu(card, &wrapped_apdu);
+                SC_TEST_RET(ctx, SC_LOG_DEBUG_NORMAL, r, "wrapped APDU is invalid");
+
+                r = _sc_transmit_apdu(card, &wrapped_apdu);
+                SC_TEST_RET(ctx, SC_LOG_DEBUG_NORMAL, r, "unable to transmit wrapped APDU");
+
+                /* unwrap apdu */
+                r = card->ops->sm_unwrap_apdu(card, &wrapped_apdu, apdu);
+                SC_TEST_RET(ctx, SC_LOG_DEBUG_NORMAL, r, "sm_unwrap_apdu error");
+
+        } else {
+                /* no wrap needed, just call reader driver */
+                r = _sc_transmit_apdu(card, apdu);
+        }
         return r;
 }

src/libopensc/card-entersafe.c

@@ -131 +131 @@
 
         card->caps = SC_CARD_CAP_RNG; 
+        card->ctx->use_sm = 0;
 
         /* we need read_binary&friends with max 224 bytes per read */

src/libopensc/card-epass2003.c

@@ -857 +857 @@
         card->cla = 0x00;
         card->drv_data = NULL;
-
-        g_sm = SM_PLAIN;
+        card->ctx->use_sm = 1;
+
+        g_sm = SM_SCP01;
+        /* g_sm = SM_PLAIN; */
 
         /* decide FIPS/Non-FIPS mode */
@@ -2217 +2219 @@
         epass2003_ops.match_card = epass2003_match_card;
         epass2003_ops.init = epass2003_init;
+        epass2003_ops.sm_wrap_apdu = epass2003_sm_wrap_apdu;
+        epass2003_ops.sm_unwrap_apdu = epass2003_sm_unwrap_apdu;
         epass2003_ops.write_binary = NULL;
         epass2003_ops.write_record = NULL;

src/libopensc/iso7816.c

@@ -1012 +1012 @@
         NULL,                   /* init   */
         NULL,                   /* finish */
+        NULL,                   /* sm_wrap_apdu */
+        NULL,                   /* sm_unwrap_apdu */
         iso7816_read_binary,
         iso7816_write_binary,

src/libopensc/opensc.h

@@ -464 +464 @@
          * the card cannot be handled with this driver. */
         int (*init)(struct sc_card *card);
+        /* Called before invoke card_driver->ops->transmit.
+         * Performing APDU wrap. If set to NULL, there is no wrapping.
+         * Usefull on Secure Messaging APDU encode
+         * Returns SC_SUCCESS or error code */
+    int (*sm_wrap_apdu)(struct sc_card *card,
+                         struct sc_apdu *plain, struct sc_apdu *sm);
+        /* Same as wrap_apdu, but perform unwrap */
+    int (*sm_unwrap_apdu)(struct sc_card *card,
+                         struct sc_apdu *sm, struct sc_apdu *plain);
         /* Called when the card object is being freed.  finish() has to
          * deallocate all possible private data. */
@@ -619 +628 @@
         void *mutex;
 
+        int use_sm;
         unsigned int magic;
 } sc_context_t;