Skip to contentSkip to conversation

usb-ccid (v8)

PATCH In review Alon Levy 3 participants 14 messages Nov 28, 2010 – Dec 12, 2010 Kbuild

lore
Share & tools
lore

Alon Levy

author
#0 lore raw

cover usb-ccid (v8)

This patchset adds three new devices, usb-ccid, ccid-card-passthru and ccid-card-emulated, providing a CCID bus, a simple passthru protocol implementing card requiring a client, and a standalone emulated card.

It also introduces a new directory libcaccard with CAC card emulation, CAC is a type of ISO 7816 smart card.

v7-v8 changes:
* Blue Swirl comments:
* usb-ccid: deannonymize some structs
* usb-ccid: coding style change - answer_t and bulk_in_t fixed
* usb-ccid: handle endianess conversion between guest and host
* usb-ccid: s/ccid_bulk_in_copy_out/ccid_bulk_in_copy_to_guest/
* ccid-card-emulated: fix segfault if backend not specified
* ccid-card-emulated: let last reader inserted win
* libcaccard: remove double vscard_common.h

v6->v7 changes:
* external libcaccard became internal directory libcaccard
* statically link object files into qemu
* produce libcaccard.so for usage by external projects
* applied coding style to new code (please check me)
- did not use the qemu options parsing for libcaccard, since it seems to draw large amounts of qemu code (monitor for instance).

v5->v6 changes:
* really remove static debug (I apologize for claiming to have done so before)

v4->v5 changes:
* rebased to latest
* remove static debug in card devices
* fix --enable-smartcard to link
* stall instead of assert when exceeding BULK_OUT_DATA_SIZE
* make ccid_reserve_recv_buf for too large len discard message, not exit
* make ccid_reserve_recv_buf return void*
* fix typo
* remove commented code in VMState

v3->v4:
* remove ccid field in CCIDBus
* remove static debug in bus
* add back docs

v2->v3:
* split into bus (usb-ccid.c, uses ccid.h) and card (ccid-card-passthru.c).
* removed documentation (being revised).

v1->v2:
* all QSIMPLEQ turned into fixed sized rings
* all allocated buffers turned into fixed size buffers
* added migration support
* added a message to tell client qemu has migrated to ip:port
* for lack of monitor commands ip:port are 0:0, which causes the updated vscclient to connect to one port higher on the same host. will add monitor commands in a separate patch. tested with current setup.

Alon Levy (5):
usb-ccid: add CCID bus
ccid: add passthru card device
libcaccard: update configure to build and use internal libcaccard
ccid: add ccid-card-emulated device (v2)
ccid: add docs

Robert Relyea (1):
libcaccard: initial commit after coding style fixes

 Makefile                     |    6 +-
 Makefile.objs                |    6 +
 Makefile.target              |    2 +
 configure                    |   36 ++
 docs/ccid.txt                |  125 ++++
 docs/libcaccard.txt          |  482 +++++++++++++++
 hw/ccid-card-emulated.c      |  501 ++++++++++++++++
 hw/ccid-card-passthru.c      |  277 +++++++++
 hw/ccid.h                    |   34 ++
 hw/usb-ccid.c                | 1345 ++++++++++++++++++++++++++++++++++++++++++
 libcaccard/Makefile          |   18 +
 libcaccard/cac.c             |  411 +++++++++++++
 libcaccard/cac.h             |   20 +
 libcaccard/card_7816.c       |  780 ++++++++++++++++++++++++
 libcaccard/card_7816.h       |   60 ++
 libcaccard/card_7816t.h      |  163 +++++
 libcaccard/config.h          |   81 +++
 libcaccard/event.c           |  112 ++++
 libcaccard/eventt.h          |   28 +
 libcaccard/link_test.c       |   20 +
 libcaccard/mutex.h           |   59 ++
 libcaccard/passthru.c        |  608 +++++++++++++++++++
 libcaccard/passthru.h        |   50 ++
 libcaccard/vcard.c           |  350 +++++++++++
 libcaccard/vcard.h           |   85 +++
 libcaccard/vcard_emul.h      |   59 ++
 libcaccard/vcard_emul_nss.c  | 1147 +++++++++++++++++++++++++++++++++++
 libcaccard/vcard_emul_type.c |   60 ++
 libcaccard/vcard_emul_type.h |   29 +
 libcaccard/vcardt.h          |   66 ++
 libcaccard/vevent.h          |   26 +
 libcaccard/vreader.c         |  515 ++++++++++++++++
 libcaccard/vreader.h         |   53 ++
 libcaccard/vreadert.h        |   23 +
 libcaccard/vscard_common.h   |  130 ++++
 libcaccard/vscclient.c       |  710 ++++++++++++++++++++++
 36 files changed, 8475 insertions(+), 2 deletions(-)
 create mode 100644 docs/ccid.txt
 create mode 100644 docs/libcaccard.txt
 create mode 100644 hw/ccid-card-emulated.c
 create mode 100644 hw/ccid-card-passthru.c
 create mode 100644 hw/ccid.h
 create mode 100644 hw/usb-ccid.c
 create mode 100644 libcaccard/Makefile
 create mode 100644 libcaccard/cac.c
 create mode 100644 libcaccard/cac.h
 create mode 100644 libcaccard/card_7816.c
 create mode 100644 libcaccard/card_7816.h
 create mode 100644 libcaccard/card_7816t.h
 create mode 100644 libcaccard/config.h
 create mode 100644 libcaccard/event.c
 create mode 100644 libcaccard/eventt.h
 create mode 100644 libcaccard/link_test.c
 create mode 100644 libcaccard/mutex.h
 create mode 100644 libcaccard/passthru.c
 create mode 100644 libcaccard/passthru.h
 create mode 100644 libcaccard/vcard.c
 create mode 100644 libcaccard/vcard.h
 create mode 100644 libcaccard/vcard_emul.h
 create mode 100644 libcaccard/vcard_emul_nss.c
 create mode 100644 libcaccard/vcard_emul_type.c
 create mode 100644 libcaccard/vcard_emul_type.h
 create mode 100644 libcaccard/vcardt.h
 create mode 100644 libcaccard/vevent.h
 create mode 100644 libcaccard/vreader.c
 create mode 100644 libcaccard/vreader.h
 create mode 100644 libcaccard/vreadert.h
 create mode 100644 libcaccard/vscard_common.h
 create mode 100644 libcaccard/vscclient.c
Signature · 1 line
1.7.3.2
author
#1 lore raw

PATCH 1/6 usb-ccid: add CCID bus

A CCID device is a smart card reader. It is a USB device, defined at [1]. This patch introduces the usb-ccid device that is a ccid bus. Next patches will introduce two card types to use it, a passthru card and an emulated card.

[1] http://www.usb.org/developers/devclass_docs/DWG_Smart-Card_CCID_Rev110.

---
 Makefile.objs |    1 +
 configure     |   12 +
 hw/ccid.h     |   34 ++
 hw/usb-ccid.c | 1345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 1392 insertions(+), 0 deletions(-)
 create mode 100644 hw/ccid.h
 create mode 100644 hw/usb-ccid.c
Makefile.objs +1 -0
index 23b17ce..713131f 100644
@@ -183,6 +183,7 @@ hw-obj-$(CONFIG_FDC) += fdc.o
 hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o
 hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o
 hw-obj-$(CONFIG_DMA) += dma.o
+hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o
 
 # PPC devices
 hw-obj-$(CONFIG_OPENPIC) += openpic.o
configure +12 -0
index 2917874..fb9eac2 100755
@@ -332,6 +332,7 @@ zero_malloc=""
 trace_backend="nop"
 trace_file="trace"
 spice=""
+smartcard="no"
 
 # OS specific
 if check_define __linux__ ; then
@@ -739,6 +740,10 @@ for opt do
   ;;
   --enable-vhost-net) vhost_net="yes"
   ;;
+  --disable-smartcard) smartcard="no"
+  ;;
+  --enable-smartcard) smartcard="yes"
+  ;;
   --*dir)
   ;;
   *) echo "ERROR: unknown option $opt"; show_help="yes"
@@ -934,6 +939,8 @@ echo "  --trace-file=NAME        Full PATH,NAME of file to store traces"
 echo "                           Default:trace-<pid>"
 echo "  --disable-spice          disable spice"
 echo "  --enable-spice           enable spice"
+echo "  --disable-smartcard      disable smartcard support"
+echo "  --enable-smartcard       enable smartcard support"
 echo ""
 echo "NOTE: The object files are built at the place where configure is launched"
 exit 1
@@ -2354,6 +2361,7 @@ echo "vhost-net support $vhost_net"
 echo "Trace backend     $trace_backend"
 echo "Trace output file $trace_file-<pid>"
 echo "spice support     $spice"
+echo "smartcard support $smartcard"
 
 if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -2617,6 +2625,10 @@ if test "$spice" = "yes" ; then
   echo "CONFIG_SPICE=y" >> $config_host_mak
 fi
 
+if test "$smartcard" = "yes" ; then
+  echo "CONFIG_SMARTCARD=y" >> $config_host_mak
+fi
+
 # XXX: suppress that
 if [ "$bsd" = "yes" ] ; then
   echo "CONFIG_BSD=y" >> $config_host_mak
hw/ccid.h new file +34 -0
new file mode 100644
index 0000000..a38f971
@@ -0,0 +1,34 @@
+#ifndef __CCID_H__
+#define __CCID_H__
+
+#include "qdev.h"
+
+typedef struct CCIDCardState CCIDCardState;
+typedef struct CCIDCardInfo CCIDCardInfo;
+
+struct CCIDCardState {
+    DeviceState qdev;
+};
+
+struct CCIDCardInfo {
+    DeviceInfo qdev;
+    void (*print)(Monitor *mon, CCIDCardState *card, int indent);
+    const uint8_t *(*get_atr)(CCIDCardState *card, uint32_t *len);
+    void (*apdu_from_guest)(CCIDCardState *card, const uint8_t *apdu, uint32_t len);
+    int (*exitfn)(CCIDCardState *card);
+    int (*initfn)(CCIDCardState *card);
+};
+
+void ccid_card_send_apdu_to_guest(CCIDCardState *card, uint8_t* apdu, uint32_t len);
+void ccid_card_card_removed(CCIDCardState *card);
+void ccid_card_card_inserted(CCIDCardState *card);
+void ccid_card_card_error(CCIDCardState *card, uint64_t error);
+void ccid_card_qdev_register(CCIDCardInfo *card);
+
+/* support guest visible insertion/removal of ccid devices based on actual
+ * devices connected/removed. Called by card implementation (passthru, local) */
+int ccid_card_ccid_attach(CCIDCardState *card);
+void ccid_card_ccid_detach(CCIDCardState *card);
+
+#endif // __CCID_H__
+
hw/usb-ccid.c new file +1345 -0

1,345 lines not on this page · raw message

Signature · 1 line
1.7.3.2
author
#2 lore raw

PATCH 2/6 ccid: add passthru card device

In reply to Alon Levy
---
 Makefile.objs              |    2 +-
 hw/ccid-card-passthru.c    |  277 ++++++++++++++++++++++++++++++++++++++++++++
 libcaccard/vscard_common.h |  130 +++++++++++++++++++++
 3 files changed, 408 insertions(+), 1 deletions(-)
 create mode 100644 hw/ccid-card-passthru.c
 create mode 100644 libcaccard/vscard_common.h
Makefile.objs +1 -1
index 713131f..2059e89 100644
@@ -183,7 +183,7 @@ hw-obj-$(CONFIG_FDC) += fdc.o
 hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o
 hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o
 hw-obj-$(CONFIG_DMA) += dma.o
-hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o
+hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o
 
 # PPC devices
 hw-obj-$(CONFIG_OPENPIC) += openpic.o
hw/ccid-card-passthru.c new file +277 -0

277 lines not on this page · raw message

libcaccard/vscard_common.h new file +130 -0

130 lines not on this page · raw message

Signature · 1 line
1.7.3.2
author
#3 lore raw

PATCH 3/6 libcaccard: initial commit after coding style fixes

In reply to Alon Levy

From: Robert Relyea <[email protected]>

---
 libcaccard/cac.c             |  411 +++++++++++++++
 libcaccard/cac.h             |   20 +
 libcaccard/card_7816.c       |  780 ++++++++++++++++++++++++++++
 libcaccard/card_7816.h       |   60 +++
 libcaccard/card_7816t.h      |  163 ++++++
 libcaccard/config.h          |   81 +++
 libcaccard/event.c           |  112 ++++
 libcaccard/eventt.h          |   28 +
 libcaccard/link_test.c       |   20 +
 libcaccard/mutex.h           |   59 +++
 libcaccard/passthru.c        |  608 ++++++++++++++++++++++
 libcaccard/passthru.h        |   50 ++
 libcaccard/vcard.c           |  350 +++++++++++++
 libcaccard/vcard.h           |   85 ++++
 libcaccard/vcard_emul.h      |   59 +++
 libcaccard/vcard_emul_nss.c  | 1147 ++++++++++++++++++++++++++++++++++++++++++
 libcaccard/vcard_emul_type.c |   60 +++
 libcaccard/vcard_emul_type.h |   29 ++
 libcaccard/vcardt.h          |   66 +++
 libcaccard/vevent.h          |   26 +
 libcaccard/vreader.c         |  515 +++++++++++++++++++
 libcaccard/vreader.h         |   53 ++
 libcaccard/vreadert.h        |   23 +
 libcaccard/vscclient.c       |  710 ++++++++++++++++++++++++++
 24 files changed, 5515 insertions(+), 0 deletions(-)
 create mode 100644 libcaccard/cac.c
 create mode 100644 libcaccard/cac.h
 create mode 100644 libcaccard/card_7816.c
 create mode 100644 libcaccard/card_7816.h
 create mode 100644 libcaccard/card_7816t.h
 create mode 100644 libcaccard/config.h
 create mode 100644 libcaccard/event.c
 create mode 100644 libcaccard/eventt.h
 create mode 100644 libcaccard/link_test.c
 create mode 100644 libcaccard/mutex.h
 create mode 100644 libcaccard/passthru.c
 create mode 100644 libcaccard/passthru.h
 create mode 100644 libcaccard/vcard.c
 create mode 100644 libcaccard/vcard.h
 create mode 100644 libcaccard/vcard_emul.h
 create mode 100644 libcaccard/vcard_emul_nss.c
 create mode 100644 libcaccard/vcard_emul_type.c
 create mode 100644 libcaccard/vcard_emul_type.h
 create mode 100644 libcaccard/vcardt.h
 create mode 100644 libcaccard/vevent.h
 create mode 100644 libcaccard/vreader.c
 create mode 100644 libcaccard/vreader.h
 create mode 100644 libcaccard/vreadert.h
 create mode 100644 libcaccard/vscclient.c
libcaccard/cac.c new file +411 -0
new file mode 100644
index 0000000..e51caec
@@ -0,0 +1,411 @@
+/*
+ * implement the applets for the CAC card.
+ */
+#include "cac.h"
+#include "vcard.h"
+#include "vcard_emul.h"
+#include "card_7816.h"
+#include <stdlib.h>
+#include <string.h>
+
+#define CAC_GET_PROPERTIES  0x56
+#define CAC_GET_ACR         0x4c
+#define CAC_READ_BUFFER     0x52
+#define CAC_UPDATE_BUFFER   0x58
+#define CAC_SIGN_DECRYPT    0x42
+#define CAC_GET_CERTIFICATE 0x36
+
+/* private data for PKI applets */
+typedef struct CACPKIAppletDataStruct {
+    unsigned char *cert;
+    int cert_len;
+    unsigned char *cert_buffer;
+    int cert_buffer_len;
+    unsigned char *sign_buffer;
+    int sign_buffer_len;
+    VCardKey *key;
+} CACPKIAppletData;
+
+/*
+ * CAC applet private data
+ */
+struct VCardAppletPrivateStruct {
+    union {
+        CACPKIAppletData pki_data;
+        void *reserved;
+    } u;
+};
+
+/*
+ * handle all the APDU's that are common to all CAC applets
+ */
+static VCardStatus
+cac_common_process_apdu(VCard *card, VCardAPDU *apdu, VCardResponse **response)
+{
+    int ef;
+
+    switch (apdu->a_ins) {
+    case VCARD7816_INS_SELECT_FILE:
+        if (apdu->a_p1 != 0x02) {
+            /* let the 7816 code handle applet switches */
+            return VCARD_NEXT;
+        }
+        /* handle file id setting */
+        if (apdu->a_Lc != 2) {
+            *response = vcard_make_response(
+                VCARD7816_STATUS_ERROR_DATA_INVALID);
+            return VCARD_DONE;
+        }
+        /* CAC 1.0 only supports ef = 0 */
+        ef = apdu->a_body[0] | (apdu->a_body[1] << 8);
+        if (ef != 0 ) {
+            *response = vcard_make_response(
+                VCARD7816_STATUS_ERROR_FILE_NOT_FOUND);
+            return VCARD_DONE;
+        }
+        *response = vcard_make_response(VCARD7816_STATUS_SUCCESS);
+        return VCARD_DONE;
+    case VCARD7816_INS_GET_RESPONSE:
+    case VCARD7816_INS_VERIFY:
+        /* let the 7816 code handle these */
+        return VCARD_NEXT;
+    case CAC_GET_PROPERTIES:
+    case CAC_GET_ACR:
+        /* skip these for now, this will probably be needed */
+        *response = vcard_make_response(VCARD7816_STATUS_ERROR_P1_P2_INCORRECT);
+        return VCARD_DONE;
+    }
+    *response = vcard_make_response(
+        VCARD7816_STATUS_ERROR_COMMAND_NOT_SUPPORTED);
+    return VCARD_DONE;
+}
+
+/*
+ *  resest the inter call state between applet selects
+ */
+static VCardStatus
+cac_applet_pki_reset(VCard *card, int channel)
+{
+    VCardAppletPrivate *applet_private = NULL;
+    CACPKIAppletData *pki_applet = NULL;
+    applet_private = vcard_get_current_applet_private(card, channel);
+    ASSERT(applet_private);
+    pki_applet = &(applet_private->u.pki_data);
+
+    pki_applet->cert_buffer = NULL;
+    if (pki_applet->sign_buffer) {
+        free(pki_applet->sign_buffer);
+        pki_applet->sign_buffer = NULL;
+    }
+    pki_applet->cert_buffer_len = 0;
+    pki_applet->sign_buffer_len = 0;
+    return VCARD_DONE;
+}
+
+static VCardStatus
+cac_applet_pki_process_apdu(VCard *card, VCardAPDU *apdu,
+                            VCardResponse **response)
+{
+    CACPKIAppletData *pki_applet = NULL;
+    VCardAppletPrivate *applet_private = NULL;
+    int size, next;
+    unsigned char *sign_buffer;
+    vcard_7816_status_t status;
+
+    applet_private = vcard_get_current_applet_private(card, apdu->a_channel);
+    ASSERT(applet_private);
+    pki_applet = &(applet_private->u.pki_data);
+
+    switch (apdu->a_ins) {
+    case CAC_UPDATE_BUFFER:
+        *response = vcard_make_response(
+            VCARD7816_STATUS_ERROR_CONDITION_NOT_SATISFIED);
+        return VCARD_DONE;
+    case CAC_GET_CERTIFICATE:
+        if ((apdu->a_p2 != 0) || (apdu->a_p1 != 0)) {
+           *response = vcard_make_response(
+                            VCARD7816_STATUS_ERROR_P1_P2_INCORRECT);
+           break;
+        }
+        ASSERT(pki_applet->cert != NULL);
+        size = apdu->a_Le;
+        if (pki_applet->cert_buffer == NULL) {
+            pki_applet->cert_buffer=pki_applet->cert;
+            pki_applet->cert_buffer_len=pki_applet->cert_len;
+        }
+        size = MIN(size, pki_applet->cert_buffer_len);
+        next = MIN(255, pki_applet->cert_buffer_len - size);
+        *response = vcard_response_new_bytes(
+                        card, pki_applet->cert_buffer, size,
+                        apdu->a_Le, next ?
+                        VCARD7816_SW1_WARNING_CHANGE :
+                        VCARD7816_SW1_SUCCESS,
+                        next);
+        pki_applet->cert_buffer += size;
+        pki_applet->cert_buffer_len -= size;
+        if ((*response == NULL) || (next == 0)) {
+            pki_applet->cert_buffer=NULL;
+        }
+        if (*response == NULL) {
+            *response = vcard_make_response(
+                            VCARD7816_STATUS_EXC_ERROR_MEMORY_FAILURE);
+        }
+        return VCARD_DONE;
+    case CAC_SIGN_DECRYPT:
+        if (apdu->a_p2 != 0) {
+           *response = vcard_make_response(
+                            VCARD7816_STATUS_ERROR_P1_P2_INCORRECT);
+           break;
+        }
+        size = apdu->a_Lc;
+
+        sign_buffer = realloc(pki_applet->sign_buffer,
+                      pki_applet->sign_buffer_len+size);
+        if (sign_buffer == NULL) {
+            free(pki_applet->sign_buffer);
+            pki_applet->sign_buffer = NULL;
+            pki_applet->sign_buffer_len = 0;
+            *response = vcard_make_response(
+                            VCARD7816_STATUS_EXC_ERROR_MEMORY_FAILURE);
+            return VCARD_DONE;
+        }
+        memcpy(sign_buffer+pki_applet->sign_buffer_len, apdu->a_body, size);
+        size += pki_applet->sign_buffer_len;
+        switch (apdu->a_p1) {
+        case  0x80:
+            /* p1 == 0x80 means we haven't yet sent the whole buffer, wait for
+             * the rest */
+            pki_applet->sign_buffer = sign_buffer;
+            pki_applet->sign_buffer_len = size;
+            *response = vcard_make_response(VCARD7816_STATUS_SUCCESS);
+            return VCARD_DONE;
+        case 0x00:
+            /* we now have the whole buffer, do the operation, result will be
+             * in the sign_buffer */
+            status = vcard_emul_rsa_op(card, pki_applet->key,
+                                       sign_buffer, size);
+            if (status != VCARD7816_STATUS_SUCCESS) {
+                *response = vcard_make_response(status);
+                break;
+            }
+            *response = vcard_response_new(card, sign_buffer, size, apdu->a_Le,
+                                                     VCARD7816_STATUS_SUCCESS);
+            if (*response == NULL) {
+                *response = vcard_make_response(
+                                VCARD7816_STATUS_EXC_ERROR_MEMORY_FAILURE);
+            }
+            break;
+        default:
+           *response = vcard_make_response(
+                                VCARD7816_STATUS_ERROR_P1_P2_INCORRECT);
+            break;
+        }
+        free(sign_buffer);
+        pki_applet->sign_buffer = NULL;
+        pki_applet->sign_buffer_len = 0;
+        return VCARD_DONE;
+    case CAC_READ_BUFFER:
+        /* new CAC call, go ahead and use the old version for now */
+        /* TODO: implement */
+        *response = vcard_make_response(
+                                VCARD7816_STATUS_ERROR_COMMAND_NOT_SUPPORTED);
+        return VCARD_DONE;
+    }
+    return cac_common_process_apdu(card, apdu, response);
+}
+
+
+static VCardStatus
+cac_applet_id_process_apdu(VCard *card, VCardAPDU *apdu,
+                           VCardResponse **response)
+{
+    switch (apdu->a_ins) {
+    case CAC_UPDATE_BUFFER:
+        *response = vcard_make_response(
+                        VCARD7816_STATUS_ERROR_CONDITION_NOT_SATISFIED);
+        return VCARD_DONE;
+    case CAC_READ_BUFFER:
+        /* new CAC call, go ahead and use the old version for now */
+        /* TODO: implement */
+        *response = vcard_make_response(
+                        VCARD7816_STATUS_ERROR_COMMAND_NOT_SUPPORTED);
+        return VCARD_DONE;
+    }
+    return cac_common_process_apdu(card, apdu, response);
+}
+
+
+/*
+ * TODO: if we ever want to support general CAC middleware, we will need to
+ * implement the various containers.
+ */
+static VCardStatus
+cac_applet_container_process_apdu(VCard *card, VCardAPDU *apdu,
+                                  VCardResponse **response)
+{
+    switch (apdu->a_ins) {
+    case CAC_READ_BUFFER:
+    case CAC_UPDATE_BUFFER:
+        *response = vcard_make_response(
+                        VCARD7816_STATUS_ERROR_COMMAND_NOT_SUPPORTED);
+        return VCARD_DONE;
+    default:
+        break;
+    }
+    return cac_common_process_apdu(card, apdu, response);
+}
+
+/*
+ * utilities for creating and destroying the private applet data
+ */
+static void
+cac_delete_pki_applet_private(VCardAppletPrivate *applet_private)
+{
+    CACPKIAppletData *pki_applet_data = NULL;
+    if (pki_applet_data == NULL) {
+        return;
+    }
+    pki_applet_data = &(applet_private->u.pki_data);
+    if (pki_applet_data->cert != NULL) {
+        free(pki_applet_data->cert);
+    }
+    if (pki_applet_data->sign_buffer != NULL) {
+        free(pki_applet_data->sign_buffer);
+    }
+    if (pki_applet_data->key != NULL) {
+        vcard_emul_delete_key(pki_applet_data->key);
+    }
+    free(applet_private);
+}
+
+static VCardAppletPrivate *
+cac_new_pki_applet_private(const unsigned char *cert,
+                           int cert_len, VCardKey *key)
+{
+    CACPKIAppletData *pki_applet_data = NULL;
+    VCardAppletPrivate *applet_private = NULL;
+    applet_private = (VCardAppletPrivate *)malloc(sizeof(VCardAppletPrivate));
+
+    if (applet_private == NULL) {
+        goto fail;
+    }
+    pki_applet_data= &(applet_private->u.pki_data);
+    pki_applet_data->cert_buffer = NULL;
+    pki_applet_data->cert_buffer_len = 0;
+    pki_applet_data->sign_buffer = NULL;
+    pki_applet_data->sign_buffer_len = 0;
+    pki_applet_data->key = NULL;
+    pki_applet_data->cert = (unsigned char *)malloc(cert_len+1);
+    if (pki_applet_data->cert == NULL) {
+        goto fail;
+    }
+    /*
+     * if we want to support compression, then we simply change the 0 to a 1
+     * and compress the cert data with libz
+     */
+    pki_applet_data->cert[0] = 0; /* not compressed */
+    memcpy(&pki_applet_data->cert[1], cert, cert_len);
+    pki_applet_data->cert_len = cert_len+1;
+
+    pki_applet_data->key = key;
+    return applet_private;
+
+fail:
+    if (applet_private) {
+        cac_delete_pki_applet_private(applet_private);
+    }
+    return NULL;
+}
+
+
+/*
+ * create a new cac applet which links to a given cert
+ */
+static VCardApplet *
+cac_new_pki_applet(int i, const unsigned char *cert,
+                   int cert_len, VCardKey *key)
+{
+    VCardAppletPrivate *applet_private = NULL;
+    VCardApplet *applet = NULL;
+    unsigned char pki_aid[] = { 0xa0, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00 };
+    int pki_aid_len = sizeof (pki_aid);
+
+    pki_aid[pki_aid_len-1] = i;
+
+    applet_private = cac_new_pki_applet_private(cert, cert_len, key);
+    if (applet_private == NULL) {
+        goto failure;
+    }
+    applet = vcard_new_applet(cac_applet_pki_process_apdu, cac_applet_pki_reset,
+                              pki_aid, pki_aid_len);
+    if (applet == NULL) {
+        goto failure;
+    }
+    vcard_set_applet_private(applet, applet_private,
+                             cac_delete_pki_applet_private);
+    applet_private = NULL;
+
+    return applet;
+
+failure:
+    if (applet_private != NULL) {
+        cac_delete_pki_applet_private(applet_private);
+    }
+    return NULL;
+}
+
+
+static unsigned char cac_default_container_aid[] =
+    { 0xa0, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00 };
+static unsigned char cac_id_aid[] =
+    { 0xa0, 0x00, 0x00, 0x00, 0x79, 0x03, 0x00 };
+/*
+ * Initialize the cac card. This is the only public function in this file. All
+ * the rest are connected through function pointers.
+ */
+VCardStatus
+cac_card_init(VReader *reader, VCard *card,
+              const char *params,
+              unsigned char * const *cert,
+              int cert_len[],
+              VCardKey *key[] /* adopt the keys*/,
+              int cert_count)
+{
+    int i;
+    VCardApplet *applet;
+
+    /* CAC Cards are VM Cards */
+    vcard_set_type(card,VCARD_VM);
+
+    /* create one PKI applet for each cert */
+    for (i=0; i < cert_count; i++) {
+        applet = cac_new_pki_applet(i, cert[i], cert_len[i], key[i]);
+        if (applet == NULL) {
+            goto failure;
+        }
+        vcard_add_applet(card, applet);
+    }
+
+    /* create a default blank container applet */
+    applet = vcard_new_applet(cac_applet_container_process_apdu,
+                              NULL, cac_default_container_aid,
+                              sizeof(cac_default_container_aid));
+    if (applet == NULL) {
+        goto failure;
+    }
+    vcard_add_applet(card, applet);
+
+    /* create a default blank container applet */
+    applet = vcard_new_applet(cac_applet_id_process_apdu,
+                              NULL, cac_id_aid,
+                              sizeof(cac_id_aid));
+    if (applet == NULL) {
+        goto failure;
+    }
+    vcard_add_applet(card, applet);
+    return VCARD_DONE;
+
+failure:
+    return VCARD_FAIL;
+}
+
libcaccard/cac.h new file +20 -0
new file mode 100644
index 0000000..bb2a9f0
@@ -0,0 +1,20 @@
+/*
+ * defines the entry point for the cac card. Only used by cac.c anc
+ * vcard_emul_type.c
+ */
+#ifndef CAC_H
+#define CAC_H 1
+#include "vcard.h"
+#include "vreader.h"
+/*
+ * Initialize the cac card. This is the only public function in this file. All
+ * the rest are connected through function pointers.
+ */
+VCardStatus cac_card_init(VReader *reader, VCard *card, const char *params,
+              unsigned char * const *cert, int cert_len[],
+              VCardKey *key[] /* adopt the keys*/,
+              int cert_count);
+
+/* not yet implemented */
+VCardStatus cac_is_cac_card(VReader *reader);
+#endif
libcaccard/card_7816.c new file +780 -0

780 lines not on this page · raw message

libcaccard/card_7816.h new file +60 -0

60 lines not on this page · raw message

libcaccard/card_7816t.h new file +163 -0

163 lines not on this page · raw message

libcaccard/config.h new file +81 -0

81 lines not on this page · raw message

libcaccard/event.c new file +112 -0

112 lines not on this page · raw message

libcaccard/eventt.h new file +28 -0
new file mode 100644
index 0000000..4c3df4f
@@ -0,0 +1,28 @@
+/*
+ *
+ */
+
+#ifndef EVENTT_H
+#define EVENTT_H 1
+#include "vreadert.h"
+#include "vcardt.h"
+
+typedef struct VEventStruct VEvent;
+
+typedef enum {
+    VEVENT_READER_INSERT,
+    VEVENT_READER_REMOVE,
+    VEVENT_CARD_INSERT,
+    VEVENT_CARD_REMOVE,
+    VEVENT_LAST,
+} VEventType;
+
+struct VEventStruct {
+    VEvent *next;
+    VEventType type;
+    VReader *reader;
+    VCard *card;
+};
+#endif
+
+
libcaccard/link_test.c new file +20 -0
new file mode 100644
index 0000000..40d2c6d
@@ -0,0 +1,20 @@
+/*
+ *
+ */
+#include <stdio.h>
+#include "vcard.h"
+
+VCardStatus cac_card_init(const char *flags, VCard *card,
+                const unsigned char *cert[],
+                int cert_len[], VCardKey *key[] /* adopt the keys*/,
+                int cert_count);
+/*
+ * this will crash... just test the linkage right now
+ */
+
+main(int argc, char **argv)
+{
+    VCard *card; /* no constructor yet */
+    cac_card_init("", card, NULL, 0, NULL, 0);
+}
+
libcaccard/mutex.h new file +59 -0

59 lines not on this page · raw message

libcaccard/passthru.c new file +608 -0

608 lines not on this page · raw message

libcaccard/passthru.h new file +50 -0

50 lines not on this page · raw message

libcaccard/vcard.c new file +350 -0

350 lines not on this page · raw message

libcaccard/vcard.h new file +85 -0

85 lines not on this page · raw message

libcaccard/vcard_emul.h new file +59 -0

59 lines not on this page · raw message

libcaccard/vcard_emul_nss.c new file +1147 -0

114 lines not on this page · raw message

libcaccard/vcard_emul_type.c new file +60 -0

60 lines not on this page · raw message

libcaccard/vcard_emul_type.h new file +29 -0
new file mode 100644
index 0000000..da15528

Lines of this file are not shown. View the raw message.

libcaccard/vcardt.h new file +66 -0

66 lines not on this page · raw message

libcaccard/vevent.h new file +26 -0
new file mode 100644
index 0000000..f202ea8

Lines of this file are not shown. View the raw message.

libcaccard/vreader.c new file +515 -0

515 lines not on this page · raw message

libcaccard/vreader.h new file +53 -0

53 lines not on this page · raw message

libcaccard/vreadert.h new file +23 -0
new file mode 100644
index 0000000..4c01259

Lines of this file are not shown. View the raw message.

libcaccard/vscclient.c new file +710 -0

710 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.3.2

Part of the diff is not shown here. View the raw message.

author
#4 lore raw

PATCH 4/6 libcaccard: update configure to build and use internal libcaccard

In reply to Alon Levy
---
 Makefile            |    6 ++++--
 Makefile.objs       |    5 +++++
 Makefile.target     |    2 ++
 configure           |   24 ++++++++++++++++++++++++
 libcaccard/Makefile |   18 ++++++++++++++++++
 5 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 libcaccard/Makefile
Makefile +4 -2
index 4e120a2..e673bf1 100644
@@ -172,6 +172,8 @@ check-qlist: check-qlist.o qlist.o qint.o $(CHECK_PROG_DEPS)
 check-qfloat: check-qfloat.o qfloat.o $(CHECK_PROG_DEPS)
 check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o $(CHECK_PROG_DEPS)
 
+QEMULIBS=libhw32 libhw64 libuser libdis libdis-user libcaccard
+
 clean:
 # avoid old build problems by removing potentially incorrect old files
 	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
@@ -183,7 +185,7 @@ clean:
 	rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
 	rm -f trace-dtrace.h trace-dtrace.h-timestamp
 	$(MAKE) -C tests clean
-	for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser libdis libdis-user; do \
+	for d in $(ALL_SUBDIRS) $(QEMULIBS); do \
 	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
 	rm -f $$d/qemu-options.def; \
         done
@@ -194,7 +196,7 @@ distclean: clean
 	rm -f roms/seabios/config.mak roms/vgabios/config.mak
 	rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.dvi qemu-doc.fn qemu-doc.info qemu-doc.ky qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp qemu-doc.vr
 	rm -f qemu-tech.info qemu-tech.aux qemu-tech.cp qemu-tech.dvi qemu-tech.fn qemu-tech.info qemu-tech.ky qemu-tech.log qemu-tech.pdf qemu-tech.pg qemu-tech.toc qemu-tech.tp qemu-tech.vr
-	for d in $(TARGET_DIRS) libhw32 libhw64 libuser libdis libdis-user; do \
+	for d in $(TARGET_DIRS) $(QEMULIBS); do \
 	rm -rf $$d || exit 1 ; \
         done
 
Makefile.objs +5 -0
index 2059e89..82691c0 100644
@@ -297,6 +297,11 @@ user-obj-y += qemu-timer-common.o
 endif
 endif
 
+######################################################################
+# smartcard
+
+libcaccard-y = cac.o event.o passthru.o vcard.o vreader.o vcard_emul_nss.o vcard_emul_type.o card_7816.o
+
 vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
 
 vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
Makefile.target +2 -0
index 2800f47..7dd6932 100644
@@ -341,6 +341,8 @@ obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y))
 
 endif # CONFIG_SOFTMMU
 
+obj-y += $(addprefix $(SRC_PATH)/libcaccard/, $(libcaccard-$(CONFIG_SMARTCARD)))
+
 obj-y += $(addprefix ../, $(trace-obj-y))
 obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
 
configure +24 -0
index fb9eac2..4b55904 100755
@@ -2130,6 +2130,25 @@ EOF
   fi
 fi
 
+# check for libcaccard for smartcard support
+if test "$smartcard" != "no" ; then
+  smartcard_cflags="-I\$(SRC_PATH)/libcaccard"
+  smartcard_libs="-L\$(SRC_PATH)/libcaccard -lcaccard"
+  libcaccard_libs=$($pkgconfig --libs nss 2>/dev/null)
+  libcaccard_cflags=$($pkgconfig --cflags nss)
+  # TODO - what's the minimal nss version we support?
+  if $pkgconfig --atleast-version=3.12.8 nss; then
+    smartcard="yes"
+    QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcaccard_cflags"
+    LIBS="$libcaccard_libs $LIBS"
+  else
+    if test "smartcard" = "yes" ; then
+      feature_not_found "smartcard"
+    fi
+    smartcard="no"
+  fi
+fi
+
 ##########################################
 
 ##########################################
@@ -2956,6 +2975,11 @@ fi
 if test "$target_darwin_user" = "yes" ; then
   echo "CONFIG_DARWIN_USER=y" >> $config_target_mak
 fi
+if test "$smartcard" = "yes" ; then
+  echo "subdir-$target: subdir-libcaccard" >> $config_host_mak
+  echo "libcaccard_libs=$libcaccard_libs" >> $config_host_mak
+  echo "libcaccard_cflags=$libcaccard_cflags" >> $config_host_mak
+fi
 list=""
 if test ! -z "$gdb_xml_files" ; then
   for x in $gdb_xml_files; do
libcaccard/Makefile new file +18 -0
new file mode 100644
index 0000000..a339af1
@@ -0,0 +1,18 @@
+include ../Makefile.objs
+include ../config-host.mak
+include ../config-all-devices.mak
+include $(SRC_PATH)/rules.mak
+
+CFLAGS+=-fPIC
+
+libcaccard.so: $(libcaccard-y)
+	gcc -shared $(libcaccard_libs) -o $@ $^
+
+vscclient: $(libcaccard-y) vscclient.o
+	gcc $(libcaccard_libs) -o $@ $^
+
+all: libcaccard.so vscclient
+
+clean:
+	rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ libcaccard.so
+
Signature · 1 line
1.7.3.2
author
#5 lore raw

PATCH 5/6 ccid: add ccid-card-emulated device (v2)

In reply to Alon Levy

changes from v1:
remove stale comments, use only c-style comments bugfix, forgot to set recv_len
change reader name to 'Virtual Reader'

---
 Makefile.objs           |    2 +-
 hw/ccid-card-emulated.c |  501 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 502 insertions(+), 1 deletions(-)
 create mode 100644 hw/ccid-card-emulated.c
Makefile.objs +1 -1
index 82691c0..a494ee0 100644
@@ -183,7 +183,7 @@ hw-obj-$(CONFIG_FDC) += fdc.o
 hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o
 hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o
 hw-obj-$(CONFIG_DMA) += dma.o
-hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o
+hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o ccid-card-emulated.o
 
 # PPC devices
 hw-obj-$(CONFIG_OPENPIC) += openpic.o
hw/ccid-card-emulated.c new file +501 -0

501 lines not on this page · raw message

Signature · 1 line
1.7.3.2
author
#6 lore raw

PATCH 6/6 ccid: add docs

In reply to Alon Levy
---
 docs/ccid.txt       |  125 +++++++++++++
 docs/libcaccard.txt |  482 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 607 insertions(+), 0 deletions(-)
 create mode 100644 docs/ccid.txt
 create mode 100644 docs/libcaccard.txt
docs/ccid.txt new file +125 -0
new file mode 100644
index 0000000..3af4f92
@@ -0,0 +1,125 @@
+Qemu CCID Device Documentation.
+
+Contents
+1. USB CCID device
+2. Building
+3. Using ccid-card-emulated with hardware
+4. Using ccid-card-emulated with certificates
+5. Using ccid-card-passthru with client side hardware
+6. Using ccid-card-passthru with client side certificates
+7. Passthrough protocol scenario
+8. libcaccard
+
+1. USB CCID device
+
+The USB CCID device is a USB device implementing the CCID specification, which
+lets one connect smart card readers that implement the same spec. For more
+information see the specification:
+
+ Universal Serial Bus
+ Device Class: Smart Card
+ CCID
+ Specification for
+ Integrated Circuit(s) Cards Interface Devices
+ Revision 1.1
+ April 22rd, 2005
+
+Smartcard are used for authentication, single sign on, decryption in
+public/private schemes and digital signatures. A smartcard reader on the client
+cannot be used on a guest with simple usb passthrough since it will then not be
+available on the client, possibly locking the computer when it is "removed". On
+the other hand this device can let you use the smartcard on both the client and
+the guest machine. It is also possible to have a completely virtual smart card
+reader and smart card (i.e. not backed by a physical device) using this device.
+
+2. Building
+
+The cryptographic functions and access to the physical card is done via NSS.
+
+Installing NSS:
+
+In redhat/fedora:
+    yum install nss-devel
+In ubuntu/debian:
+    apt-get install libnss3-dev
+    (not tested on ubuntu)
+
+Configuring and building:
+    ./configure --enable-smartcard && make
+
+3. Using ccid-card-emulated with hardware
+
+Assuming you have a working smartcard on the host with the current
+user, using NSS, qemu acts as another NSS client using ccid-card-emulated:
+
+    qemu -usb -device usb-ccid -device ccid-card-emualated
+
+4. Using ccid-card-emulated with certificates
+
+You must create the certificates. This is a one time process. We use NSS
+certificates:
+
+    certutil -d /etc/pki/nssdb -x -t "CT,CT,CT" -S -s "CN=cert1" -n cert1
+
+Note: you must have exactly three certificates.
+
+Assuming the current user can access the certificates (use certutil -L to
+verify), you can use the emulated card type with the certificates backend:
+
+    qemu -usb -device usb-ccid -device ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3
+
+5. Using ccid-card-passthru with client side hardware
+
+on the host specify the ccid-card-passthru device with a suitable chardev:
+
+    qemu -chardev socket,server,host=0.0.0.0,port=2001,id=ccid,nowait -usb -device usb-ccid -device ccid-card-passthru,chardev=ccid
+
+on the client run vscclient, built when you built the libcaccard library:
+    libcaccard/vscclient <qemu-host> 2001
+
+6. Using ccid-card-passthru with client side certificates
+
+Run qemu as per #5, and run vscclient as follows:
+(Note: vscclient command line interface is in a state of change)
+
+    libcaccard/vscclient -e "db=\"/etc/pki/nssdb\" use_hw=no soft=(,Test,CAC,,cert1,cert2,cert3)" <qemu-host> 2001
+
+7. Passthrough protocol scenario
+
+This is a typical interchange of messages when using the passthru card device.
+usb-ccid is a usb device. It defaults to an unattached usb device on startup.
+usb-ccid expects a chardev and expects the protocol defined in
+cac_card/vscard_common.h to be passed over that.
+
+A typical interchange is:
+
+client event      |      vscclient           |    passthru    |     usb-ccid  |  guest event
+----------------------------------------------------------------------------------------------
+                  |      VSC_Init            |                |               |
+                  |      VSC_ReaderAdd       |                |     attach    |
+                  |                          |                |               |  sees new usb device.
+card inserted     |                          |                |               |
+                  |      VSC_ATR             |                |               |
+                  |                          |                |               |  guest operation, APDU transfer via CCID
+                  |                          |   VSC_APDU     |               |
+                  |      VSC_APDU            |                |               |
+client<->physical |                          |                |               |
+card APDU exchange|                          |                |               |
+                            [APDU<->APDU repeats several times]              
+card removed      |                          |                |               |
+                  |      VSC_CardRemove      |                |               |
+kill/quit         |                          |                |               |
+  vscclient       |                          |                |               |
+                  |      VSC_ReaderRemove    |                |    detach     |
+                  |                          |                |               |   usb device removed.
+
+
+8. libcaccard
+
+ccid-card-passthru and vscclient use libcaccard as the card emulator.
+libcaccard implements a completely virtual CAC (DoD standard for smart cards)
+compliant card and uses NSS to actually retrive certificates and do any
+encryption using the backend (real reader + card or file backed certificates).
+
+For documentation of cac_card see README in libcaccard subdirectory.
+
docs/libcaccard.txt new file +482 -0

482 lines not on this page · raw message

Signature · 1 line
1.7.3.2
author
#7 lore raw
In reply to Alon Levy

ping.

Blue Swirl - one patch I forgot is in a later message titled "..v8.1.." with the removal of the libcaccard build.

Quoted 140 lines · Alon Levy

This patchset adds three new devices, usb-ccid, ccid-card-passthru and ccid-card-emulated, providing a CCID bus, a simple passthru protocol implementing card requiring a client, and a standalone emulated card.

It also introduces a new directory libcaccard with CAC card emulation, CAC is a type of ISO 7816 smart card.

v7-v8 changes:
* Blue Swirl comments:
* usb-ccid: deannonymize some structs
* usb-ccid: coding style change - answer_t and bulk_in_t fixed
* usb-ccid: handle endianess conversion between guest and host
* usb-ccid: s/ccid_bulk_in_copy_out/ccid_bulk_in_copy_to_guest/
* ccid-card-emulated: fix segfault if backend not specified
* ccid-card-emulated: let last reader inserted win
* libcaccard: remove double vscard_common.h

v6->v7 changes:
* external libcaccard became internal directory libcaccard
* statically link object files into qemu
* produce libcaccard.so for usage by external projects
* applied coding style to new code (please check me)
- did not use the qemu options parsing for libcaccard, since it seems to draw large amounts of qemu code (monitor for instance).

v5->v6 changes:
* really remove static debug (I apologize for claiming to have done so before)

v4->v5 changes:
* rebased to latest
* remove static debug in card devices
* fix --enable-smartcard to link
* stall instead of assert when exceeding BULK_OUT_DATA_SIZE
* make ccid_reserve_recv_buf for too large len discard message, not exit
* make ccid_reserve_recv_buf return void*
* fix typo
* remove commented code in VMState

v3->v4:
* remove ccid field in CCIDBus
* remove static debug in bus
* add back docs

v2->v3:
* split into bus (usb-ccid.c, uses ccid.h) and card (ccid-card-passthru.c).
* removed documentation (being revised).

v1->v2:
* all QSIMPLEQ turned into fixed sized rings
* all allocated buffers turned into fixed size buffers
* added migration support
* added a message to tell client qemu has migrated to ip:port
* for lack of monitor commands ip:port are 0:0, which causes the updated vscclient to connect to one port higher on the same host. will add monitor commands in a separate patch. tested with current setup.

Alon Levy (5):
usb-ccid: add CCID bus
ccid: add passthru card device
libcaccard: update configure to build and use internal libcaccard
ccid: add ccid-card-emulated device (v2)
ccid: add docs

Robert Relyea (1):
libcaccard: initial commit after coding style fixes

 Makefile                     |    6 +-
 Makefile.objs                |    6 +
 Makefile.target              |    2 +
 configure                    |   36 ++
 docs/ccid.txt                |  125 ++++
 docs/libcaccard.txt          |  482 +++++++++++++++
 hw/ccid-card-emulated.c      |  501 ++++++++++++++++
 hw/ccid-card-passthru.c      |  277 +++++++++
 hw/ccid.h                    |   34 ++
 hw/usb-ccid.c                | 1345 ++++++++++++++++++++++++++++++++++++++++++
 libcaccard/Makefile          |   18 +
 libcaccard/cac.c             |  411 +++++++++++++
 libcaccard/cac.h             |   20 +
 libcaccard/card_7816.c       |  780 ++++++++++++++++++++++++
 libcaccard/card_7816.h       |   60 ++
 libcaccard/card_7816t.h      |  163 +++++
 libcaccard/config.h          |   81 +++
 libcaccard/event.c           |  112 ++++
 libcaccard/eventt.h          |   28 +
 libcaccard/link_test.c       |   20 +
 libcaccard/mutex.h           |   59 ++
 libcaccard/passthru.c        |  608 +++++++++++++++++++
 libcaccard/passthru.h        |   50 ++
 libcaccard/vcard.c           |  350 +++++++++++
 libcaccard/vcard.h           |   85 +++
 libcaccard/vcard_emul.h      |   59 ++
 libcaccard/vcard_emul_nss.c  | 1147 +++++++++++++++++++++++++++++++++++
 libcaccard/vcard_emul_type.c |   60 ++
 libcaccard/vcard_emul_type.h |   29 +
 libcaccard/vcardt.h          |   66 ++
 libcaccard/vevent.h          |   26 +
 libcaccard/vreader.c         |  515 ++++++++++++++++
 libcaccard/vreader.h         |   53 ++
 libcaccard/vreadert.h        |   23 +
 libcaccard/vscard_common.h   |  130 ++++
 libcaccard/vscclient.c       |  710 ++++++++++++++++++++++
 36 files changed, 8475 insertions(+), 2 deletions(-)
 create mode 100644 docs/ccid.txt
 create mode 100644 docs/libcaccard.txt
 create mode 100644 hw/ccid-card-emulated.c
 create mode 100644 hw/ccid-card-passthru.c
 create mode 100644 hw/ccid.h
 create mode 100644 hw/usb-ccid.c
 create mode 100644 libcaccard/Makefile
 create mode 100644 libcaccard/cac.c
 create mode 100644 libcaccard/cac.h
 create mode 100644 libcaccard/card_7816.c
 create mode 100644 libcaccard/card_7816.h
 create mode 100644 libcaccard/card_7816t.h
 create mode 100644 libcaccard/config.h
 create mode 100644 libcaccard/event.c
 create mode 100644 libcaccard/eventt.h
 create mode 100644 libcaccard/link_test.c
 create mode 100644 libcaccard/mutex.h
 create mode 100644 libcaccard/passthru.c
 create mode 100644 libcaccard/passthru.h
 create mode 100644 libcaccard/vcard.c
 create mode 100644 libcaccard/vcard.h
 create mode 100644 libcaccard/vcard_emul.h
 create mode 100644 libcaccard/vcard_emul_nss.c
 create mode 100644 libcaccard/vcard_emul_type.c
 create mode 100644 libcaccard/vcard_emul_type.h
 create mode 100644 libcaccard/vcardt.h
 create mode 100644 libcaccard/vevent.h
 create mode 100644 libcaccard/vreader.c
 create mode 100644 libcaccard/vreader.h
 create mode 100644 libcaccard/vreadert.h
 create mode 100644 libcaccard/vscard_common.h
 create mode 100644 libcaccard/vscclient.c
Signature · 1 line
1.7.3.2
#8 lore raw
Quoted 1 line · Alon Levy

ping.

I don't think Anthony's concerns (or mine) have been addressed.

Quoted 2 lines

Blue Swirl - one patch I forgot is in a later message titled "..v8.1.." with the removal of the libcaccard build.

This should be merged with 4/6.

#9 lore raw

Hi,

Quoted 5 lines · Blue Swirl
Quoted 1 line · Alon Levy

ping.

I don't think Anthony's concerns (or mine) have been addressed.

Could you be a bit more verbose please ?

Thanks & Regards,

Hans

#10 lore raw
Quoted 4 lines · Hans de Goede

Hi,

Quoted 1 line · Blue Swirl
Quoted 8 lines
Quoted 6 lines · Alon Levy
Quoted 2 lines

ping.

I don't think Anthony's concerns (or mine) have been addressed.

Could you be a bit more verbose please ?

I'm not sure if this answer was OK for Anthony given the previous discussion:
http://article.gmane.org/gmane.comp.emulators.qemu/85793

About my concerns, see my previous mail about merging the shared library fix to 4/6 and about other stuff that does not belong to QEMU but which should be a separate project.

author
#11 lore raw
Quoted 9 lines · Blue Swirl
Quoted 8 lines · Hans de Goede

Hi,

Quoted 5 lines · Blue Swirl
Quoted 2 lines · Alon Levy

ping.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

I don't think Anthony's concerns (or mine) have been addressed.

Could you be a bit more verbose please ?

I'm not sure if this answer was OK for Anthony given the previous discussion:
http://article.gmane.org/gmane.comp.emulators.qemu/85793

I'm pretty sure it's ok by anthony since he suggested the inclusion of libcacard in qemu in the first place. (that's not a typo - I've renamed it to avoid the double card, I'll send an updated patch merging 4/6 and including this rename).

Quoted 4 lines

About my concerns, see my previous mail about merging the shared library fix to 4/6 and about other stuff that does not belong to QEMU but which should be a separate project.

your concerns were:
usb-ccid.c:
endianess - I've added network to host convertions (used as guest to host). coding style - answer_t and bulk_in_t renamed
hungarian style usage - gave 'excuse' (spec uses those names) anonymous structs usage - named
libcaccard:
don't build a library that qemu doesn't use: v8.1, will fold in and send v9

Am I missing anything?

Alon

#12 lore raw
Quoted 37 lines · Alon Levy
Quoted 9 lines · Blue Swirl
Quoted 8 lines · Hans de Goede

Hi,

Quoted 5 lines · Blue Swirl
Quoted 2 lines · Alon Levy

ping.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

I don't think Anthony's concerns (or mine) have been addressed.

Could you be a bit more verbose please ?

I'm not sure if this answer was OK for Anthony given the previous discussion:
http://article.gmane.org/gmane.comp.emulators.qemu/85793

I'm pretty sure it's ok by anthony since he suggested the inclusion of libcacard in qemu in the first place. (that's not a typo - I've renamed it to avoid the double card, I'll send an updated patch merging 4/6 and including this rename).

Quoted 4 lines

About my concerns, see my previous mail about merging the shared library fix to 4/6 and about other stuff that does not belong to QEMU but which should be a separate project.

your concerns were:
 usb-ccid.c:
 endianess - I've added network to host convertions (used as guest to host). coding style - answer_t and bulk_in_t renamed
 hungarian style usage - gave 'excuse' (spec uses those names) anonymous structs usage - named
 libcaccard:
 don't build a library that qemu doesn't use: v8.1, will fold in and send v9

Quoted 1 line

Am I missing anything?

No. But now that I tried to build it, there are other problems.

There is a typo in configure:

configure +1 -1
index 4b55904..7288b09 100755
@@ -2142,7 +2142,7 @@ if test "$smartcard" != "no" ; then
     QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcaccard_cflags"
     LIBS="$libcaccard_libs $LIBS"
   else
-    if test "smartcard" = "yes" ; then
+    if test "$smartcard" = "yes" ; then
       feature_not_found "smartcard"
     fi
     smartcard="no"

Build also fails when compiling in an object directory:
make: *** libcaccard: No such file or directory. Stop.
make: *** [subdir-libcaccard] Error 2

I'd even remove the configure option and build the card by default if the dependencies are found.

There were also whitespace problems when applying:
Applying ccid: add ccid-card-emulated device (v2) .dotest/patch:37: trailing whitespace.
* for i in 1 2 3; do certutil -d /etc/pki/nssdb -x -t "CT,CT,CT" -S
-s "CN=user$i" -n user$i; done
warning: 1 line applied after fixing whitespace errors. Applying ccid: add docs
.dotest/patch:121: trailing whitespace.

                            [APDU<->APDU repeats several times]

warning: 1 line applied after fixing whitespace errors.

author
#13 lore raw

On Sun, Dec 12, 2010 at 03:07:52PM +0000, Blue Swirl wrote:
<snip>

Quoted 16 lines

There is a typo in configure:

configure +1 -1
index 4b55904..7288b09 100755
@@ -2142,7 +2142,7 @@ if test "$smartcard" != "no" ; then
     QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcaccard_cflags"
     LIBS="$libcaccard_libs $LIBS"
   else
-    if test "smartcard" = "yes" ; then
+    if test "$smartcard" = "yes" ; then
       feature_not_found "smartcard"
     fi
     smartcard="no"
Quoted 4 lines

Build also fails when compiling in an object directory:
make: *** libcaccard: No such file or directory. Stop.
make: *** [subdir-libcaccard] Error 2

ok, will fix.

Quoted 3 lines

I'd even remove the configure option and build the card by default if the dependencies are found.

ok, good idea.

Quoted 11 lines

There were also whitespace problems when applying:
Applying ccid: add ccid-card-emulated device (v2) .dotest/patch:37: trailing whitespace.
* for i in 1 2 3; do certutil -d /etc/pki/nssdb -x -t "CT,CT,CT" -S
-s "CN=user$i" -n user$i; done
warning: 1 line applied after fixing whitespace errors. Applying ccid: add docs
.dotest/patch:121: trailing whitespace.

                            [APDU<->APDU repeats several times]

warning: 1 line applied after fixing whitespace errors.

will fix as well.