From patchwork Wed Mar 27 20:36:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 231831 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7E7D12C00A3 for ; Thu, 28 Mar 2013 07:59:00 +1100 (EST) Received: from localhost ([::1]:57526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKx7S-000058-Vz for incoming@patchwork.ozlabs.org; Wed, 27 Mar 2013 16:38:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKx5d-0006WR-BK for qemu-devel@nongnu.org; Wed, 27 Mar 2013 16:37:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKx5Y-0004wu-NK for qemu-devel@nongnu.org; Wed, 27 Mar 2013 16:36:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKx5Y-0004wi-GC for qemu-devel@nongnu.org; Wed, 27 Mar 2013 16:36:52 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2RKapi1002427 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 27 Mar 2013 16:36:52 -0400 Received: from localhost.localdomain (vpn1-5-152.ams2.redhat.com [10.36.5.152]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2RKaaQ2030384; Wed, 27 Mar 2013 16:36:50 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2013 22:36:33 +0200 Message-Id: <1364416595-25830-9-git-send-email-alevy@redhat.com> In-Reply-To: <1364416595-25830-1-git-send-email-alevy@redhat.com> References: <1364416595-25830-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: mlureau@redhat.com Subject: [Qemu-devel] [PATCH v2 08/10] libcacard: move atr setting from macro to function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Only because qemu's checkpatch complains about it. Signed-off-by: Alon Levy --- Makefile.objs | 1 + libcacard/vcard_emul_nss.c | 14 +++++++++++--- libcacard/vcardt.c | 40 ++++++++++++++++++++++++++++++++++++++++ libcacard/vcardt.h | 13 ------------- libcacard/vcardt_internal.h | 6 ++++++ 5 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 libcacard/vcardt.c create mode 100644 libcacard/vcardt_internal.h diff --git a/Makefile.objs b/Makefile.objs index f99841c..6d47567 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -41,6 +41,7 @@ libcacard-y += libcacard/vcard.o libcacard/vreader.o libcacard-y += libcacard/vcard_emul_nss.o libcacard-y += libcacard/vcard_emul_type.o libcacard-y += libcacard/card_7816.o +libcacard-y += libcacard/vcardt.o ###################################################################### # Target independent part of system emulation. The long term path is to diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c index 9ba80fb..1a3e568 100644 --- a/libcacard/vcard_emul_nss.c +++ b/libcacard/vcard_emul_nss.c @@ -33,6 +33,9 @@ #include "vreader.h" #include "vevent.h" +#include "libcacard/vcardt_internal.h" + + typedef enum { VCardEmulUnknown = -1, VCardEmulFalse = 0, @@ -519,18 +522,23 @@ vcard_emul_reader_get_slot(VReader *vreader) } /* - * Card ATR's map to physical cards. VCARD_ATR_PREFIX will set appropriate + * Card ATR's map to physical cards. vcard_alloc_atr will set appropriate * historical bytes for any software emulated card. The remaining bytes can be * used to indicate the actual emulator */ -static const unsigned char nss_atr[] = { VCARD_ATR_PREFIX(3), 'N', 'S', 'S' }; +static unsigned char *nss_atr; +static int nss_atr_len; void vcard_emul_get_atr(VCard *card, unsigned char *atr, int *atr_len) { - int len = MIN(sizeof(nss_atr), *atr_len); + int len; assert(atr != NULL); + if (nss_atr == NULL) { + nss_atr = vcard_alloc_atr("NSS", &nss_atr_len); + } + len = MIN(nss_atr_len, *atr_len); memcpy(atr, nss_atr, len); *atr_len = len; } diff --git a/libcacard/vcardt.c b/libcacard/vcardt.c new file mode 100644 index 0000000..9ce4648 --- /dev/null +++ b/libcacard/vcardt.c @@ -0,0 +1,40 @@ +#include +#include +#include + +#include "libcacard/vcardt.h" + +#include "libcacard/vcardt_internal.h" + +/* create an ATR with appropriate historical bytes */ +#define ATR_TS_DIRECT_CONVENTION 0x3b +#define ATR_TA_PRESENT 0x10 +#define ATR_TB_PRESENT 0x20 +#define ATR_TC_PRESENT 0x40 +#define ATR_TD_PRESENT 0x80 + +unsigned char *vcard_alloc_atr(const char *postfix, int *atr_len) +{ + int postfix_len; + const char prefix[] = "VCARD_"; + const char default_postfix[] = "DEFAULT"; + const int prefix_len = sizeof(prefix) - 1; + int total_len; + unsigned char *atr; + + if (postfix == NULL) { + postfix = default_postfix; + } + postfix_len = strlen(postfix); + total_len = 3 + prefix_len + postfix_len; + atr = g_malloc(total_len); + atr[0] = ATR_TS_DIRECT_CONVENTION; + atr[1] = ATR_TD_PRESENT + prefix_len + postfix_len; + atr[2] = 0x00; + memcpy(&atr[3], prefix, prefix_len); + memcpy(&atr[3 + prefix_len], postfix, postfix_len); + if (atr_len) { + *atr_len = total_len; + } + return atr; +} diff --git a/libcacard/vcardt.h b/libcacard/vcardt.h index 3b9a619..795e265 100644 --- a/libcacard/vcardt.h +++ b/libcacard/vcardt.h @@ -25,19 +25,6 @@ typedef struct VCardEmulStruct VCardEmul; #define MAX_CHANNEL 4 -/* create an ATR with appropriate historical bytes */ -#define TS_DIRECT_CONVENTION 0x3b -#define TA_PRESENT 0x10 -#define TB_PRESENT 0x20 -#define TC_PRESENT 0x40 -#define TD_PRESENT 0x80 - -#define VCARD_ATR_PREFIX(size) \ - TS_DIRECT_CONVENTION, \ - TD_PRESENT + (6 + size), \ - 0x00, \ - 'V', 'C', 'A', 'R', 'D', '_' - typedef enum { VCARD_DONE, VCARD_NEXT, diff --git a/libcacard/vcardt_internal.h b/libcacard/vcardt_internal.h new file mode 100644 index 0000000..e5c8d2d --- /dev/null +++ b/libcacard/vcardt_internal.h @@ -0,0 +1,6 @@ +#ifndef VCARDT_INTERNAL_H +#define VCARDT_INTERNAL_H + +unsigned char *vcard_alloc_atr(const char *postfix, int *atr_len); + +#endif