diff --git a/ccid/Makefile.am b/ccid/Makefile.am
index 46c740c..237c0c8 100644
--- a/ccid/Makefile.am
+++ b/ccid/Makefile.am
@@ -1,9 +1,9 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src m4 patches
-DISTCLEANFILES = Doxyfile libpace.pc
+DISTCLEANFILES = Doxyfile
-EXTRA_DIST = README.dox libpace.pc.in Doxyfile.in apdus
+EXTRA_DIST = README.dox Doxyfile.in apdus
do_subst = sed \
-e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \
@@ -26,10 +26,3 @@ doc :
.PHONY: doc
endif
-
-if WITH_PACE
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpace.pc
-libpace.pc :
- $(do_subst) < $(srcdir)/libpace.pc.in > libpace.pc
-endif
diff --git a/ccid/configure.ac b/ccid/configure.ac
index 70d0659..755d958 100644
--- a/ccid/configure.ac
+++ b/ccid/configure.ac
@@ -7,6 +7,7 @@ AC_CONFIG_SRCDIR([src/ccid.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
+LT_INIT
# Checks for programs.
AC_PROG_CXX
@@ -14,7 +15,6 @@ AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_LIBTOOL
-AC_PROG_RANLIB
AM_PROG_CC_C_O
PKG_PROG_PKG_CONFIG
@@ -74,28 +74,35 @@ saved_CPPFLAGS="$CPPFLAGS"
saved_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $OPENSSL_CFLAGS"
LIBS="$LDFLAGS $OPENSSL_LIBS"
-
AC_CHECK_HEADERS(openssl/evp.h, [], [ AC_MSG_ERROR([openssl/evp.h not found, install OpenSSL or use ./configure OPENSSL_CFLAGS=...]) ])
AC_MSG_CHECKING([for EVP_read_pw_string_min])
AC_TRY_LINK_FUNC(EVP_read_pw_string_min, [ AC_MSG_RESULT([yes]) ], [ AC_MSG_ERROR([OpenSSL not found, use ./configure OPENSSL_LIBS=...]) ])
+CPPFLAGS="$saved_CPPFLAGS"
+LIBS="$saved_LIBS"
+AC_SUBST(OPENSSL_CFLAGS)
+AC_SUBST(OPENSSL_LIBS)
# --enable-pace
AC_ARG_ENABLE(pace,
AS_HELP_STRING([--enable-pace], [Enable Password Authenticated Connection Establishment (PACE)]),
[enable_pace="${enableval}"], [enable_pace=no])
if test "x$enable_pace" != xno ; then
- AC_CHECK_HEADERS(openssl/pace.h, [], [ AC_MSG_ERROR([openssl/pace.h not found, install OpenPACE or use ./configure OPENSSL_CFLAGS=...]) ])
- AC_MSG_CHECKING([for parse_ef_card_access])
- AC_TRY_LINK_FUNC(parse_ef_card_access, [ AC_MSG_RESULT([yes]) ], [ AC_MSG_ERROR([OpenPACE not found, use ./configure OPENSSL_LIBS=...]) ])
+ PKG_CHECK_EXISTS([libpace],
+ [PKG_CHECK_MODULES([LIBPACE], [libpace])],
+ [AC_MSG_WARN([libpace not found by pkg-config])])
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $LIBPACE_CFLAGS"
+ LIBS="$LDFLAGS $LIBPACE_LIBS"
+ AC_CHECK_HEADERS(pace/pace.h, [], [ AC_MSG_ERROR([pace/pace.h not found, install libpace or use ./configure LIBPACE_CFLAGS=...]) ])
+ AC_MSG_CHECKING([for EstablishPACEChannel])
+ AC_TRY_LINK_FUNC(EstablishPACEChannel, [ AC_MSG_RESULT([yes]) ], [ AC_MSG_ERROR([libpace not found, use ./configure LIBPACE_LIBS=...]) ])
+ CPPFLAGS="$saved_CPPFLAGS"
+ LIBS="$saved_LIBS"
enable_pace=yes
fi
-CPPFLAGS="$saved_CPPFLAGS"
-LIBS="$saved_LIBS"
-AC_SUBST(OPENSSL_CFLAGS)
-AC_SUBST(OPENSSL_LIBS)
-
AM_CONDITIONAL(WITH_PACE, test "${enable_pace}" != "no")
AM_COND_IF(WITH_PACE, [AC_DEFINE(WITH_PACE, 1, [enable PACE support])])
AM_COND_IF(WITH_PACE, [AC_DEFINE(BUERGERCLIENT_WORKAROUND, 1, [Always get EF.CardAccess, when connecting to a smart card. This is a workaround for the recent Buergerclient])])
@@ -160,7 +167,7 @@ AC_TYPE_UINT8_T
# Checks for library functions.
AC_FUNC_MALLOC
AC_FUNC_REALLOC
-AC_CHECK_FUNCS([memmove memset strerror])
+AC_CHECK_FUNCS([memmove memset strerror strtol])
cat << EOF
@@ -185,6 +192,8 @@ OPENSC_CFLAGS: ${OPENSC_CFLAGS}
OPENSC_LIBS: ${OPENSC_LIBS}
OPENSSL_CFLAGS: ${OPENSSL_CFLAGS}
OPENSSL_LIBS: ${OPENSSL_LIBS}
+LIBPACE_CFLAGS: ${LIBPACE_CFLAGS}
+LIBPACE_LIBS: ${LIBPACE_LIBS}
PCSC_CFLAGS: ${PCSC_CFLAGS}
PCSC_LIBS: ${PCSC_LIBS}
diff --git a/ccid/src/Makefile.am b/ccid/src/Makefile.am
index f6ae0f8..1952500 100644
--- a/ccid/src/Makefile.am
+++ b/ccid/src/Makefile.am
@@ -1,9 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src/pace -I$(top_builddir)/src/pace
-
-libpace_la_SOURCES = sm.c scutil.c pace.c pace_lib.c
-libpace_la_LIBADD = $(OPENSC_LIBS) $(OPENSSL_LIBS)
-libpace_la_CFLAGS = $(OPENSC_CFLAGS) $(OPENSSL_CFLAGS)
-
ccid_emulator_SOURCES = ccid.c usbstring.c usb.c binutil.c
ccid_emulator_LDADD = $(OPENSC_LIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS)
ccid_emulator_CFLAGS = $(OPENSC_CFLAGS) $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
@@ -12,10 +6,6 @@ cats_test_SOURCES = cats-test.c pcscutil.c
cats_test_LDADD = $(PCSC_LIBS)
cats_test_CFLAGS = $(PCSC_CFLAGS)
-pace_tool_SOURCES = pace-tool.c binutil.c
-pace_tool_LDADD = $(OPENSC_LIBS) $(OPENSSL_LIBS) libpace.la
-pace_tool_CFLAGS = $(OPENSC_CFLAGS) $(OPENSSL_CFLAGS)
-
bin_PROGRAMS =
noinst_HEADERS = \
@@ -38,23 +28,8 @@ endif
if WITH_PACE
-bin_PROGRAMS += pace-tool
-ccid_emulator_LDADD += libpace.la
-
-lib_LTLIBRARIES = libpace.la
-
-nobase_include_HEADERS = \
- pace/sm.h \
- pace/pace.h \
- pace/scutil.h \
- pace/pace_lib.h
-
+ccid_emulator_LDADD += $(LIBPACE_LIBS)
+ccid_emulator_CFLAGS += $(LIBPACE_CFLAGS)
else
ccid_emulator_SOURCES += scutil.c sm.c
-
-noinst_HEADERS += \
- pace/sm.h \
- pace/pace.h \
- pace/scutil.h \
- pace/pace_lib.h
endif
diff --git a/ccid/src/scutil.c b/ccid/src/scutil.c
deleted file mode 100644
index 74ae556..0000000
--- a/ccid/src/scutil.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (C) 2010 Frank Morgner
- *
- * This file is part of ccid.
- *
- * ccid is free software: you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- *
- * ccid is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * ccid. If not, see .
- */
-#include "scutil.h"
-#include
-#include
-#include
-
-int initialize(int reader_id, const char *cdriver, int verbose,
- sc_context_t **ctx, sc_reader_t **reader)
-{
- unsigned int i, reader_count;
-
- if (!ctx || !reader)
- return SC_ERROR_INVALID_ARGUMENTS;
-
- int r = sc_context_create(ctx, NULL);
- if (r < 0) {
- printf("Failed to create initial context: %s", sc_strerror(r));
- return r;
- }
-
- if (cdriver != NULL) {
- r = sc_set_card_driver(*ctx, cdriver);
- if (r < 0) {
- sc_error(*ctx, "Card driver '%s' not found!\n", cdriver);
- return r;
- }
- }
-
- (*ctx)->debug = verbose;
-
- reader_count = sc_ctx_get_reader_count(*ctx);
-
- if (reader_count == 0)
- return SC_ERROR_NO_READERS_FOUND;
-
- if (reader_id < 0) {
- /* Automatically try to skip to a reader with a card if reader not specified */
- for (i = 0; i < reader_count; i++) {
- *reader = sc_ctx_get_reader(*ctx, i);
- if (sc_detect_card_presence(*reader, 0) & SC_SLOT_CARD_PRESENT) {
- reader_id = i;
- sc_debug(*ctx, "Using the first reader with a card: %s", (*reader)->name);
- break;
- }
- }
- if (reader_id >= reader_count) {
- sc_debug(*ctx, "No card found, using the first reader.");
- reader_id = 0;
- }
- }
-
- if (reader_id >= reader_count)
- return SC_ERROR_NO_READERS_FOUND;
-
- *reader = sc_ctx_get_reader(*ctx, reader_id);
-
- return SC_SUCCESS;
-}
-
-
-int build_apdu(sc_context_t *ctx, const u8 *buf, size_t len, sc_apdu_t *apdu)
-{
- const u8 *p;
- size_t len0;
-
- if (!buf || !apdu)
- return SC_ERROR_INVALID_ARGUMENTS;
-
- len0 = len;
- if (len < 4) {
- sc_error(ctx, "APDU too short (must be at least 4 bytes)");
- return SC_ERROR_INVALID_DATA;
- }
-
- memset(apdu, 0, sizeof *apdu);
- p = buf;
- apdu->cla = *p++;
- apdu->ins = *p++;
- apdu->p1 = *p++;
- apdu->p2 = *p++;
- len -= 4;
- if (!len) {
- apdu->cse = SC_APDU_CASE_1;
- } else {
- if (*p == 0 && len >= 3) {
- /* ...must be an extended APDU */
- p++;
- if (len == 3) {
- apdu->le = (*p++)<<8;
- apdu->le += *p++;
- if (apdu->le == 0)
- apdu->le = 0xffff+1;
- len -= 3;
- apdu->cse = SC_APDU_CASE_2_EXT;
- } else {
- /* len > 3 */
- apdu->lc = (*p++)<<8;
- apdu->lc += *p++;
- len -= 3;
- if (len < apdu->lc) {
- sc_error(ctx, "APDU too short (need %lu more bytes)\n",
- (unsigned long) apdu->lc - len);
- return SC_ERROR_INVALID_DATA;
- }
- apdu->data = p;
- apdu->datalen = apdu->lc;
- len -= apdu->lc;
- p += apdu->lc;
- if (!len) {
- apdu->cse = SC_APDU_CASE_3_EXT;
- } else {
- /* at this point the apdu has a Lc, so Le is on 2 bytes */
- if (len < 2) {
- sc_error(ctx, "APDU too short (need 2 more bytes)\n");
- return SC_ERROR_INVALID_DATA;
- }
- apdu->le = (*p++)<<8;
- apdu->le += *p++;
- if (apdu->le == 0)
- apdu->le = 0xffff+1;
- len -= 2;
- apdu->cse = SC_APDU_CASE_4_EXT;
- }
- }
- } else {
- /* ...must be a short APDU */
- if (len == 1) {
- apdu->le = *p++;
- if (apdu->le == 0)
- apdu->le = 0xff+1;
- len--;
- apdu->cse = SC_APDU_CASE_2_SHORT;
- } else {
- apdu->lc = *p++;
- len--;
- if (len < apdu->lc) {
- sc_error(ctx, "APDU too short (need %lu more bytes)\n",
- (unsigned long) apdu->lc - len);
- return SC_ERROR_INVALID_DATA;
- }
- apdu->data = p;
- apdu->datalen = apdu->lc;
- len -= apdu->lc;
- p += apdu->lc;
- if (!len) {
- apdu->cse = SC_APDU_CASE_3_SHORT;
- } else {
- apdu->le = *p++;
- if (apdu->le == 0)
- apdu->le = 0xff+1;
- len--;
- apdu->cse = SC_APDU_CASE_4_SHORT;
-
- }
- }
- }
- if (len) {
- sc_error(ctx, "APDU too long (%lu bytes extra)\n",
- (unsigned long) len);
- return SC_ERROR_INVALID_DATA;
- }
- }
-
- apdu->flags = SC_APDU_FLAGS_NO_GET_RESP|SC_APDU_FLAGS_NO_RETRY_WL;
-
- sc_debug(ctx, "Case %d %s APDU, %lu bytes:\tins=%02x p1=%02x p2=%02x lc=%04x le=%04x",
- apdu->cse & SC_APDU_SHORT_MASK,
- (apdu->cse & SC_APDU_EXT) != 0 ? "extended" : "short",
- (unsigned long) len0, apdu->ins, apdu->p1, apdu->p2, apdu->lc, apdu->le);
-
- return SC_SUCCESS;
-}
-
-void _bin_log(sc_context_t *ctx, int type, const char *file, int line,
- const char *func, const char *label, const u8 *data, size_t len,
- FILE *f)
-{
- /* this is the maximum supported by sc_do_log_va */
- /* Flawfinder: ignore */
- char buf[1800];
-
- if (data)
- sc_hex_dump(ctx, data, len, buf, sizeof buf);
- else
- buf[0] = 0;
- if (!f) {
- sc_do_log(ctx, type, file, line, func,
- "\n%s (%u byte%s):\n%s",
- label, len, len==1?"":"s", buf);
- } else {
- fprintf(f, "%s (%u byte%s):\n%s",
- label, len, len==1?"":"s", buf);
- }
-}
-
-static int list_drivers(sc_context_t *ctx)
-{
- int i;
-
- if (ctx->card_drivers[0] == NULL) {
- printf("No card drivers installed!\n");
- return 0;
- }
- printf("Configured card drivers:\n");
- for (i = 0; ctx->card_drivers[i] != NULL; i++) {
- printf(" %-16s %s\n", ctx->card_drivers[i]->short_name,
- ctx->card_drivers[i]->name);
- }
-
- return 0;
-}
-
-static int list_readers(sc_context_t *ctx)
-{
- unsigned int i, rcount = sc_ctx_get_reader_count(ctx);
-
- if (rcount == 0) {
- printf("No smart card readers found.\n");
- return 0;
- }
- printf("Readers known about:\n");
- printf("Nr. Driver Name\n");
- for (i = 0; i < rcount; i++) {
- sc_reader_t *screader = sc_ctx_get_reader(ctx, i);
- printf("%-7d%-11s%s\n", i, screader->driver->short_name,
- screader->name);
- }
-
- return 0;
-}
-
-int print_avail(int verbose)
-{
- sc_context_t *ctx = NULL;
-
- int r;
- r = sc_context_create(&ctx, NULL);
- if (r) {
- fprintf(stderr, "Failed to establish context: %s\n", sc_strerror(r));
- return 1;
- }
- ctx->debug = verbose;
-
- r = list_readers(ctx)|list_drivers(ctx);
-
- if (ctx)
- sc_release_context(ctx);
-
- return r;
-}
diff --git a/ccid/src/scutil.c b/ccid/src/scutil.c
new file mode 120000
index 0000000..22ced4a
--- /dev/null
+++ b/ccid/src/scutil.c
@@ -0,0 +1 @@
+../../npa/src/scutil.c
\ No newline at end of file
diff --git a/ccid/src/sm.c b/ccid/src/sm.c
deleted file mode 100644
index 2af45dd..0000000
--- a/ccid/src/sm.c
+++ /dev/null
@@ -1,622 +0,0 @@
-/*
- * Copyright (C) 2010 Frank Morgner
- *
- * This file is part of ccid.
- *
- * ccid is free software: you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- *
- * ccid is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * ccid. If not, see .
- */
-#include "scutil.h"
-#include "sm.h"
-#include
-#include
-#include
-#include
-#include
-
-static const struct sc_asn1_entry c_sm_capdu[] = {
- { "Padding-content indicator followed by cryptogram",
- SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x07, SC_ASN1_OPTIONAL, NULL, NULL },
- { "Protected Le",
- SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x17, SC_ASN1_OPTIONAL, NULL, NULL },
- { "Cryptographic Checksum",
- SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x0E, SC_ASN1_OPTIONAL, NULL, NULL },
- { NULL , 0 , 0 , 0 , NULL , NULL }
-};
-
-static const struct sc_asn1_entry c_sm_rapdu[] = {
- { "Padding-content indicator followed by cryptogram" ,
- SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x07, SC_ASN1_OPTIONAL, NULL, NULL },
- { "Processing Status",
- SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x19, 0 , NULL, NULL },
- { "Cryptographic Checksum",
- SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x0E, SC_ASN1_OPTIONAL, NULL, NULL },
- { NULL, 0, 0, 0, NULL, NULL }
-};
-
-static int
-add_iso_pad(const u8 *data, size_t datalen, int block_size, u8 **padded)
-{
- u8 *p;
- size_t p_len;
-
- if (!padded)
- return SC_ERROR_INVALID_ARGUMENTS;
-
- /* calculate length of padded message */
- p_len = (datalen / block_size) * block_size + block_size;
-
- p = realloc(*padded, p_len);
- if (!p)
- return SC_ERROR_OUT_OF_MEMORY;
-
- if (*padded != data)
- /* Flawfinder: ignore */
- memcpy(p, data, datalen);
-
- *padded = p;
-
- /* now add iso padding */
- memset(p + datalen, 0x80, 1);
- memset(p + datalen + 1, 0, p_len - datalen - 1);
-
- return p_len;
-}
-
-static int
-add_padding(const struct sm_ctx *ctx, const u8 *data, size_t datalen,
- u8 **padded)
-{
- u8 *p;
-
- switch (ctx->padding_indicator) {
- case SM_NO_PADDING:
- if (*padded != data) {
- p = realloc(*padded, datalen);
- if (!p)
- return SC_ERROR_OUT_OF_MEMORY;
- *padded = p;
- /* Flawfinder: ignore */
- memcpy(*padded, data, datalen);
- }
- return datalen;
- case SM_ISO_PADDING:
- return add_iso_pad(data, datalen, ctx->block_length, padded);
- default:
- return SC_ERROR_INVALID_ARGUMENTS;
- }
-}
-
-static int
-no_padding(u8 padding_indicator, const u8 *data, size_t datalen)
-{
- if (!datalen || !data)
- return SC_ERROR_INVALID_ARGUMENTS;
-
- size_t len;
-
- switch (padding_indicator) {
- case SM_NO_PADDING:
- len = datalen;
- break;
- case SM_ISO_PADDING:
- len = datalen;
-
- while (len) {
- len--;
- if (data[len])
- break;
- }
-
- if (data[len] != 0x80)
- return SC_ERROR_INVALID_DATA;
-
- break;
- default:
- return SC_ERROR_NOT_SUPPORTED;
- }
-
- return len;
-}
-
-static int format_le(size_t le, struct sc_asn1_entry *le_entry,
- u8 **lebuf, size_t *le_len)
-{
- u8 *p;
-
- if (!lebuf || !le_len)
- return SC_ERROR_INVALID_ARGUMENTS;
-
- p = realloc(*lebuf, *le_len);
- if (!p)
- return SC_ERROR_OUT_OF_MEMORY;
-
- switch (*le_len) {
- case 1:
- p[0] = le;
- break;
- case 2:
- p[0] = htons(le) >> 8;
- p[1] = htons(le) & 0xff;
- break;
- case 3:
- p[0] = 0x00;
- p[1] = htons(le) >> 8;
- p[2] = htons(le) & 0xff;
- break;
- default:
- return SC_ERROR_INVALID_ARGUMENTS;
- }
- *lebuf = p;
-
- sc_format_asn1_entry(le_entry, *lebuf, le_len, SC_ASN1_PRESENT);
-
- return SC_SUCCESS;
-}
-
-static int prefix_buf(u8 prefix, u8 *buf, size_t buflen, u8 **cat)
-{
- u8 *p;
-
- p = realloc(*cat, buflen + 1);
- if (!p)
- return SC_ERROR_OUT_OF_MEMORY;
-
- if (*cat == buf) {
- memmove(p + 1, p, buflen);
- } else {
- /* Flawfinder: ignore */
- memcpy(p + 1, buf, buflen);
- }
- p[0] = prefix;
-
- *cat = p;
-
- return buflen + 1;
-}
-
-static int format_data(sc_card_t *card, const struct sm_ctx *ctx,
- const u8 *data, size_t datalen,
- struct sc_asn1_entry *formatted_encrypted_data_entry,
- u8 **formatted_data, size_t *formatted_data_len)
-{
- int r;
- u8 *pad_data = NULL;
- size_t pad_data_len;
-
- if (!ctx || !formatted_data || !formatted_data_len) {
- r = SC_ERROR_INVALID_ARGUMENTS;
- goto err;
- }
-
- r = add_padding(ctx, data, datalen, &pad_data);
- if (r < 0) {
- sc_error(card->ctx, "Could not add padding to data: %s",
- sc_strerror(r));
- goto err;
- }
- pad_data_len = r;
-
- if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "Data to encrypt", pad_data, pad_data_len);
- r = ctx->encrypt(card, ctx, pad_data, pad_data_len, formatted_data);
- if (r < 0) {
- sc_error(card->ctx, "Could not encrypt the data");
- goto err;
- }
- if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "Cryptogram", *formatted_data, r);
-
- r = prefix_buf(ctx->padding_indicator, *formatted_data, r, formatted_data);
- if (r < 0) {
- sc_error(card->ctx, "Could not prepend padding indicator to formatted "
- "data: %s", sc_strerror(r));
- goto err;
- }
-
- *formatted_data_len = r;
- sc_format_asn1_entry(formatted_encrypted_data_entry,
- *formatted_data, formatted_data_len, SC_ASN1_PRESENT);
-
- r = SC_SUCCESS;
-
-err:
- if (pad_data) {
- sc_mem_clear(pad_data, pad_data_len);
- free(pad_data);
- }
-
- return r;
-}
-
-static int format_head(const struct sm_ctx *ctx, const sc_apdu_t *apdu,
- u8 **formatted_head)
-{
- if (!apdu || !formatted_head)
- return SC_ERROR_INVALID_ARGUMENTS;
-
- u8 *p = realloc(*formatted_head, 4);
- if (!p)
- return SC_ERROR_OUT_OF_MEMORY;
-
- p[0] = apdu->cla;
- p[1] = apdu->ins;
- p[2] = apdu->p1;
- p[3] = apdu->p2;
- *formatted_head = p;
-
- return add_padding(ctx, *formatted_head, 4, formatted_head);
-}
-
-static int sm_encrypt(const struct sm_ctx *ctx, sc_card_t *card,
- const sc_apdu_t *apdu, sc_apdu_t *sm_apdu)
-{
- struct sc_asn1_entry sm_capdu[4];
- u8 *p, *le = NULL, *sm_data = NULL, *fdata = NULL, *mac_data = NULL,
- *asn1 = NULL, *mac = NULL;
- size_t sm_data_len, fdata_len, mac_data_len, asn1_len, mac_len, le_len;
- int r;
-
- if (!apdu || !ctx || !card || !card->slot || !sm_apdu) {
- r = SC_ERROR_INVALID_ARGUMENTS;
- goto err;
- }
-
- if ((apdu->cla & 0x0C) == 0x0C) {
- r = SC_ERROR_INVALID_ARGUMENTS;
- sc_error(card->ctx, "Given APDU is already protected with some secure messaging");
- goto err;
- }
-
- sc_copy_asn1_entry(c_sm_capdu, sm_capdu);
-
- sm_apdu->sensitive = 0;
- sm_apdu->control = apdu->control;
- sm_apdu->flags = apdu->flags;
- sm_apdu->cla = apdu->cla|0x0C;
- sm_apdu->ins = apdu->ins;
- sm_apdu->p1 = apdu->p1;
- sm_apdu->p2 = apdu->p2;
- r = format_head(ctx, sm_apdu, &mac_data);
- if (r < 0) {
- sc_error(card->ctx, "Could not format header of SM apdu");
- goto err;
- }
- mac_data_len = r;
-
- /* get le and data depending on the case of the unsecure command */
- switch (apdu->cse) {
- case SC_APDU_CASE_1:
- break;
- case SC_APDU_CASE_2_SHORT:
- le_len = 1;
- r = format_le(apdu->le, sm_capdu + 1, &le, &le_len);
- if (r < 0) {
- sc_error(card->ctx, "Could not format Le of SM apdu");
- goto err;
- }
- if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "Protected Le (plain)", le, le_len);
- break;
- case SC_APDU_CASE_2_EXT:
- if (card->slot->active_protocol == SC_PROTO_T0) {
- /* T0 extended APDUs look just like short APDUs */
- le_len = 1;
- r = format_le(apdu->le, sm_capdu + 1, &le, &le_len);
- if (r < 0) {
- sc_error(card->ctx, "Could not format Le of SM apdu");
- goto err;
- }
- } else {
- /* in case of T1 always use 3 bytes for length */
- le_len = 3;
- r = format_le(apdu->le, sm_capdu + 1, &le, &le_len);
- if (r < 0) {
- sc_error(card->ctx, "Could not format Le of SM apdu");
- goto err;
- }
- }
- if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "Protected Le (plain)", le, le_len);
- break;
- case SC_APDU_CASE_3_SHORT:
- case SC_APDU_CASE_3_EXT:
- r = format_data(card, ctx, apdu->data, apdu->datalen,
- sm_capdu + 0, &fdata, &fdata_len);
- if (r < 0) {
- sc_error(card->ctx, "Could not format data of SM apdu");
- goto err;
- }
- if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "Padding-content indicator followed by cryptogram (plain)",
- fdata, fdata_len);
- break;
- case SC_APDU_CASE_4_SHORT:
- /* in case of T0 no Le byte is added */
- if (card->slot->active_protocol != SC_PROTO_T0) {
- le_len = 1;
- r = format_le(apdu->le, sm_capdu + 1, &le, &le_len);
- if (r < 0) {
- sc_error(card->ctx, "Could not format Le of SM apdu");
- goto err;
- }
- if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "Protected Le (plain)", le, le_len);
- }
-
- r = format_data(card, ctx, apdu->data, apdu->datalen,
- sm_capdu + 0, &fdata, &fdata_len);
- if (r < 0) {
- sc_error(card->ctx, "Could not format data of SM apdu");
- goto err;
- }
- if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "Padding-content indicator followed by cryptogram (plain)",
- fdata, fdata_len);
- break;
- case SC_APDU_CASE_4_EXT:
- if (card->slot->active_protocol == SC_PROTO_T0) {
- /* again a T0 extended case 4 APDU looks just
- * like a short APDU, the additional data is
- * transferred using ENVELOPE and GET RESPONSE */
- } else {
- /* only 2 bytes are use to specify the length of the
- * expected data */
- le_len = 2;
- r = format_le(apdu->le, sm_capdu + 1, &le, &le_len);
- if (r < 0) {
- sc_error(card->ctx, "Could not format Le of SM apdu");
- goto err;
- }
- if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "Protected Le (plain)", le, le_len);
- }
-
- r = format_data(card, ctx, apdu->data, apdu->datalen,
- sm_capdu + 0, &fdata, &fdata_len);
- if (r < 0) {
- sc_error(card->ctx, "Could not format data of SM apdu");
- goto err;
- }
- if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "Padding-content indicator followed by cryptogram (plain)",
- fdata, fdata_len);
- break;
- default:
- sc_error(card->ctx, "Unhandled apdu case");
- r = SC_ERROR_INVALID_DATA;
- goto err;
- }
-
-
- r = sc_asn1_encode(card->ctx, sm_capdu, (u8 **) &asn1, &asn1_len);
- if (r < 0) {
- goto err;
- }
- if (asn1_len) {
- p = realloc(mac_data, mac_data_len + asn1_len);
- if (!p) {
- r = SC_ERROR_OUT_OF_MEMORY;
- goto err;
- }
- mac_data = p;
- /* Flawfinder: ignore */
- memcpy(mac_data + mac_data_len, asn1, asn1_len);
- mac_data_len += asn1_len;
- r = add_padding(ctx, mac_data, mac_data_len, &mac_data);
- if (r < 0) {
- goto err;
- }
- mac_data_len = r;
- }
- if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "Data to authenticate", mac_data, mac_data_len);
-
- r = ctx->authenticate(card, ctx, mac_data, mac_data_len,
- &mac);
- if (r < 0) {
- sc_error(card->ctx, "Could not get authentication code");
- goto err;
- }
- mac_len = r;
- sc_format_asn1_entry(sm_capdu + 2, mac, &mac_len,
- SC_ASN1_PRESENT);
- if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "Cryptographic Checksum (plain)", mac, mac_len);
-
-
- /* format SM apdu */
- r = sc_asn1_encode(card->ctx, sm_capdu, (u8 **) &sm_data, &sm_data_len);
- if (r < 0)
- goto err;
- if (sm_apdu->datalen < sm_data_len) {
- sc_error(card->ctx, "Data for SM APDU too long");
- r = SC_ERROR_OUT_OF_MEMORY;
- goto err;
- }
- /* Flawfinder: ignore */
- memcpy((u8 *) sm_apdu->data, sm_data, sm_data_len);
- sm_apdu->datalen = sm_data_len;
- sm_apdu->lc = sm_apdu->datalen;
- sm_apdu->le = 0;
- sm_apdu->cse = SC_APDU_CASE_4;
- if (card->ctx->debug >= SC_LOG_TYPE_DEBUG)
- bin_log(card->ctx, "ASN.1 encoded encrypted APDU data", sm_apdu->data, sm_apdu->datalen);
-
-err:
- if (fdata)
- free(fdata);
- if (asn1)
- free(asn1);
- if (mac_data)
- free(mac_data);
- if (mac)
- free(mac);
- if (le)
- free(le);
- if (sm_data)
- free(sm_data);
-
- return r;
-}
-
-static int sm_decrypt(const struct sm_ctx *ctx, sc_card_t *card,
- const sc_apdu_t *sm_apdu, sc_apdu_t *apdu)
-{
- int r;
- struct sc_asn1_entry sm_rapdu[4];
- struct sc_asn1_entry my_sm_rapdu[4];
- u8 sw[2], mac[8], fdata[SC_MAX_APDU_BUFFER_SIZE];
- size_t sw_len = sizeof sw, mac_len = sizeof mac, fdata_len = sizeof fdata,
- buf_len, asn1_len;
- const u8 *buf;
- u8 *data = NULL, *mac_data = NULL, *asn1 = NULL;
-
- sc_copy_asn1_entry(c_sm_rapdu, sm_rapdu);
- sc_format_asn1_entry(sm_rapdu + 0, fdata, &fdata_len, 0);
- sc_format_asn1_entry(sm_rapdu + 1, sw, &sw_len, 0);
- sc_format_asn1_entry(sm_rapdu + 2, mac, &mac_len, 0);
-
- r = sc_asn1_decode(card->ctx, sm_rapdu, sm_apdu->resp, sm_apdu->resplen,
- &buf, &buf_len);
- if (r < 0)
- goto err;
- if (buf_len > 0) {
- r = SC_ERROR_UNKNOWN_DATA_RECEIVED;
- goto err;
- }
-
-
- if (sm_rapdu[2].flags & SC_ASN1_PRESENT) {
- /* copy from sm_apdu to my_sm_apdu, but leave mac at default */
- sc_copy_asn1_entry(sm_rapdu, my_sm_rapdu);
- sc_copy_asn1_entry(&c_sm_rapdu[2], &my_sm_rapdu[2]);
-
- r = sc_asn1_encode(card->ctx, my_sm_rapdu, &asn1, &asn1_len);
- if (r < 0)
- goto err;
- r = add_padding(ctx, asn1, asn1_len, &mac_data);
- if (r < 0) {
- goto err;
- }
-
- r = ctx->verify_authentication(card, ctx, mac, mac_len,
- mac_data, r);
- if (r < 0)
- goto err;
- } else {
- sc_error(card->ctx, "Cryptographic Checksum missing");
- r = SC_ERROR_ASN1_OBJECT_NOT_FOUND;
- goto err;
- }
-
-
- if (sm_rapdu[0].flags & SC_ASN1_PRESENT) {
- if (ctx->padding_indicator != fdata[0]) {
- r = SC_ERROR_UNKNOWN_DATA_RECEIVED;
- goto err;
- }
- r = ctx->decrypt(card, ctx, fdata + 1, fdata_len - 1, &data);
- if (r < 0)
- goto err;
- buf_len = r;
-
- r = no_padding(ctx->padding_indicator, data, buf_len);
- if (r < 0) {
- sc_error(card->ctx, "Could not remove padding");
- goto err;
- }
-
- if (apdu->resplen < r) {
- sc_error(card->ctx, "Response of SM APDU too long");
- r = SC_ERROR_OUT_OF_MEMORY;
- goto err;
- }
- /* Flawfinder: ignore */
- memcpy(apdu->resp, data, r);
- apdu->resplen = r;
- } else {
- apdu->resplen = 0;
- }
-
- if (sm_rapdu[1].flags & SC_ASN1_PRESENT) {
- if (sw_len != 2) {
- sc_error(card->ctx, "Length of processing status bytes must be 2");
- r = SC_ERROR_ASN1_END_OF_CONTENTS;
- goto err;
- }
- apdu->sw1 = sw[0];
- apdu->sw2 = sw[1];
- } else {
- sc_error(card->ctx, "Authenticated status bytes are missing");
- r = SC_ERROR_ASN1_OBJECT_NOT_FOUND;
- goto err;
- }
-
- if (card->ctx->debug >= SC_LOG_TYPE_DEBUG) {
- sc_debug(card->ctx, "Decrypted APDU sw1=%02x sw2=%02x",
- apdu->sw1, apdu->sw2);
- bin_log(card->ctx, "Decrypted APDU response data",
- apdu->resp, apdu->resplen);
- }
-
- r = SC_SUCCESS;
-
-err:
- if (asn1) {
- free(asn1);
- }
- if (mac_data) {
- free(mac_data);
- }
-
- return r;
-}
-
-int sm_transmit_apdu(struct sm_ctx *sctx, sc_card_t *card,
- sc_apdu_t *apdu)
-{
- sc_apdu_t sm_apdu;
- u8 rbuf[0xffff], sbuf[0xffff];
-
- sm_apdu.data = sbuf;
- sm_apdu.datalen = sizeof sbuf;
- sm_apdu.resp = rbuf;
- sm_apdu.resplen = sizeof rbuf;
-
- if (!sctx || !sctx->active) {
- sc_debug(card->ctx, "Secure messaging disabled.");
- return sc_transmit_apdu(card, apdu);
- }
-
- if ((apdu->cla & 0x0C) == 0x0C) {
- sc_debug(card->ctx, "Given APDU is already protected with some secure messaging. Deactivating own SM context.");
- sctx->active = 0;
- return sc_transmit_apdu(card, apdu);
- }
-
- if (sctx->pre_transmit)
- SC_TEST_RET(card->ctx, sctx->pre_transmit(card, sctx, apdu),
- "Could not complete SM specific pre transmit routine");
- SC_TEST_RET(card->ctx, sm_encrypt(sctx, card, apdu, &sm_apdu),
- "Could not encrypt APDU");
- SC_TEST_RET(card->ctx, sc_transmit_apdu(card, &sm_apdu),
- "Could not transmit SM APDU");
- if (sctx->post_transmit)
- SC_TEST_RET(card->ctx, sctx->post_transmit(card, sctx, &sm_apdu),
- "Could not complete SM specific post transmit routine");
- SC_TEST_RET(card->ctx, sm_decrypt(sctx, card, &sm_apdu, apdu),
- "Could not decrypt APDU");
-
- return SC_SUCCESS;
-}
diff --git a/ccid/src/sm.c b/ccid/src/sm.c
new file mode 120000
index 0000000..5336eae
--- /dev/null
+++ b/ccid/src/sm.c
@@ -0,0 +1 @@
+../../npa/src/sm.c
\ No newline at end of file
diff --git a/npa/AUTHORS b/npa/AUTHORS
new file mode 100644
index 0000000..e520634
--- /dev/null
+++ b/npa/AUTHORS
@@ -0,0 +1 @@
+Frank Morgner
diff --git a/npa/COPYING b/npa/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/npa/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
diff --git a/npa/ChangeLog b/npa/ChangeLog
new file mode 100644
index 0000000..d48f369
--- /dev/null
+++ b/npa/ChangeLog
@@ -0,0 +1,736 @@
+2010-07-01 10:11 frankmorgner
+
+ * ChangeLog, configure.ac: releasing 0.3
+
+2010-07-01 10:09 frankmorgner
+
+ * src/pace-tool.c, src/pace.h: - fixed unblock pin, it is now
+ successfully tested
+
+2010-06-25 21:31 frankmorgner
+
+ * src/ccid.c, src/pace.c, src/pace.h: - Replaced references to
+ sc_get_pin* with its OpenSSL counter parts (untested)
+ - UI functionality and maybe more is no longer shipped in
+ opensc>=0.12. This
+ and the fact that linking against libopensc in general is
+ discouraged might
+ be a reason to abandon opensc in future releases.
+
+2010-06-23 15:04 oepen
+
+ * patches/ccid-1.3.11.patch, patches/ccid-1.3.13.patch,
+ patches/pcsc-lite-1.5.5.patch, patches/pcsc-lite-1.6.1.patch:
+ -Fixed patches so bitbake can apply them
+ -Added patches to bitbake recipes
+
+2010-06-23 12:20 frankmorgner
+
+ * src/ccid.c, src/usb.c: - better (or at least some) signal
+ handling
+ - always checking the existance of a card, when requested
+
+2010-06-22 21:29 frankmorgner
+
+ * src/ccid.c, src/ccid.h, src/usb.c: - restructured handling of
+ interrupt thread to kill the thread along with all
+ the others
+ - fixed error on input parameter parsing when interrupt is
+ activated
+ - completed interrupt signaling for new/removed cards
+
+2010-06-22 09:45 frankmorgner
+
+ * src/ccid.c, src/ccid.h, src/usb.c: forcing empty parameter list
+ with function(void) instead of unspecified parameter list with
+ function()
+
+2010-06-21 16:17 frankmorgner
+
+ * src/ccid.c, src/pace.c, src/scutil.c, src/sm.c: - made debugging
+ of openssl errors human readable
+ - removed debugging of return values, added human readable
+ messages instead
+
+2010-06-20 20:15 frankmorgner
+
+ * patches/ccid-1.3.13.patch, patches/pcsc-lite-1.6.1.patch: added
+ patches for newer versions of ccid and pcsc-lite
+
+2010-06-20 19:52 frankmorgner
+
+ * patches, patches/ccid-1.3.11.patch,
+ patches/pcsc-lite-1.5.5.patch,
+ patches/pcsclite_trunk_r4993.patch, pcsclite_trunk.patch: added
+ patches for distribution packages of ccid and pcsc-lite
+
+2010-06-19 18:27 frankmorgner
+
+ * src/pace-tool.c, src/pace.c: - pace-tool: fixed length of input
+ buffer for EstablishPACEChannel
+ - added debug messages to pace.c
+
+2010-06-19 16:19 frankmorgner
+
+ * Makefile.am, pcsclite_trunk.patch, src/ccid-test.c, src/ccid.c,
+ src/ccid.h, src/pace-tool.c, src/pace.c, src/pace.h, src/usb.c: -
+ added patch to distribution package
+ - changed debug_sc_result to be a define. this now gets the line
+ of code correct
+ - added checking for input length to functions that parse the
+ bulkin buffer
+ - fixed segfault for GetReadersPACECapabilities when no card is
+ inserted
+ - added length checking of input for EstablishPACEChannel
+ - ccid-test: fixed pbSendBufferEstablish
+ - pcsclite_trunk.patch:
+ - fixed parsing of lengthCertificateDescription
+ - fixed wrong bPINOperation for pace capabilities and execute
+ pace
+
+2010-06-18 21:20 frankmorgner
+
+ * pcsclite_trunk.patch, src/ccid-test.c, src/ccid.c: - renamed
+ Special PIN Verification/Capabilities to PACE
+ Verification/Capabilities
+ - fixed PIN PACE support in ccid descriptor
+ - using uint16_t instead of WORD in PACE structures
+ - fixed lengthInputData to host byteorder
+ - fixed parsing input buffer of SCardControl with
+ FEATURE_EXECUTE_PACE
+ - parsing input buffer for PACE verification and adjusting the
+ byteorder
+ - added 30s timeout to for PACE verification
+ - triggering PACE via PC/SC now works although quite unstable
+
+2010-06-18 16:27 frankmorgner
+
+ * pcsclite_trunk.patch, src/ccid-test.c, src/ccid.c: -
+ ccid-emulator: propagating PACE capabilities to ccid descriptor
+ of
+ - ccid-test: IOCTL_FEATURE_IFD_PIN_PROPERTIES is currently
+ hardcoded and should
+ be replaced by the value from GET_FEATURE_REQUEST
+ - pcsclite_trunk.patch: fixed propagation of data from
+ SCardControl to
+ SecurePINSpecialVerify and SecurePINSpecialCapabilities
+
+2010-06-17 20:54 frankmorgner
+
+ * configure.ac, src/Makefile.am, src/ccid-test.c: added ccid-test
+ to evaluate the PACE features of ccid-emulator (untested)
+
+2010-06-16 21:06 frankmorgner
+
+ * configure.ac, pcsclite_trunk.patch, src/Makefile.am, src/ccid.c,
+ src/pace.c, src/sm.c, src/sm.h: added PACE features to
+ ccid-emulator (untested)
+
+2010-06-10 11:14 frankmorgner
+
+ * src/pace-tool.c, src/pace.c: - implemented passing a CHAT to the
+ card.
+ - note that the type PACE_CHAT should be integrated into OpenPACE
+ - added parameters for passing CHAT and certificate description
+ to pace-tool
+
+2010-06-09 15:45 frankmorgner
+
+ * configure.ac, src/Makefile.am: renamed ccid to ccid-emulator to
+ avoid conflicts with libccid
+
+2010-06-09 15:28 frankmorgner
+
+ * Makefile.am, src/Makefile.am: added missing files for
+ distribution packages
+
+2010-06-05 22:10 frankmorgner
+
+ * ChangeLog: updated checksums, install files for recipes. updated
+ log files for 0.6.1
+
+2010-06-05 14:34 frankmorgner
+
+ * src/pace-tool.c, src/pace.c, src/pace.h, src/sm.c, src/sm.h: -
+ dropped pace_transmit_apdu in favour of a solution with
+ sm_transmit_apdu.
+ post_transmit and pre_transmit can be used to perform actions
+ before
+ encrypting/decrypting a sm apdu (such as incrementing the ssc for
+ pace).
+ - fixed ssc problems. encrypted communication with more than one
+ apdu (e.g.
+ resuming the pin) is now working.
+ - fixed uninitialized pointer in sm_decrypt
+
+2010-06-04 21:34 frankmorgner
+
+ * src/sm.c: fixed uninitialized pointer which caused segfault on
+ decryption.
+
+2010-06-04 19:05 frankmorgner
+
+ * src/pace.c: fixed segfault if ef.cardaccess is not readable
+
+2010-06-03 22:17 frankmorgner
+
+ * src/sm.c: added error messages
+
+2010-06-03 21:34 frankmorgner
+
+ * src/pace-tool.c: bugfix for conversion of hex to binary for
+ interactive mode
+
+2010-06-02 13:16 frankmorgner
+
+ * README, src/pace-tool.c: added information about the environment
+ variables used
+
+2010-06-02 11:39 frankmorgner
+
+ * src/pace-tool.c: pace-tool can now read secrets from environment
+ variables
+
+2010-06-02 11:20 frankmorgner
+
+ * src/pace-tool.c: made pin puk can or mrz an optional command line
+ argument
+
+2010-06-02 10:50 frankmorgner
+
+ * src/pace-tool.c: fixed precision of time measurement
+
+2010-06-02 10:43 frankmorgner
+
+ * src/pace-tool.c: added time measurement for a PACE run
+
+2010-06-01 17:44 frankmorgner
+
+ * src/pace-tool.c: establish pace channel and exit, when no further
+ commandline option is given
+
+2010-06-01 14:52 frankmorgner
+
+ * src/pace-tool.c: - added switch to enable apdu translating
+ (disabled by default)
+
+2010-05-26 20:32 frankmorgner
+
+ * src/pace-tool.c, src/pace.c, src/pace.h, src/sm.c: removed some
+ messages, when less verbose. fixed little endian problem when
+ parsing input buffer of EstablishPACEChannel.
+
+2010-05-20 19:26 frankmorgner
+
+ * src/sm.c: fixed class byte generation for sm apdu
+
+2010-05-20 18:26 frankmorgner
+
+ * src/pace-tool.c, src/pace.c, src/sm.c: - sm_transmit_apdu doesn't
+ check SWs anymore
+ - not throwing error for sw=63XX in mse:set at
+
+2010-05-20 08:17 frankmorgner
+
+ * src/pace-tool.c, src/pace.c, src/pace.h, src/sm.c: - using short
+ apdus for mse:set at and generic authenticate. to make it work
+ with the sm implementation
+ - added parameter oldpacectx to EstablishPACEChannel to allow a a
+ new PACE connection inside an exitsting PACE connection (the
+ output buffer of the latter connection must be provided since it
+ stores the ef.cardaccess)
+ - added functionality to ask for the secret in
+ pace_reset_retry_counter
+ - added macro pace_change_pin
+ - SWs were stored at the wrong place of the output buffer from
+ EstablishPACEChannel, fixed.
+ - split up functionality of pace_test into multiple functions
+ - added new command line option to pace-tool to resume the pin.
+ resuming the pin is not working, yet.
+
+2010-05-18 11:39 oepen
+
+ * src/pace.c: Changed EXPLICIT tagging of CHAT and auxiliary
+ authenticated data to IMPLICIT tagging
+
+2010-05-16 18:53 frankmorgner
+
+ * src/pace-tool.c, src/pace.c, src/pace.h: - Added handling for
+ output buffer of EstablishPACEChannel, but CARs are still missing
+ - Handed over code for handling of IV and SSC for PACE to
+ OpenPACE
+
+2010-05-08 18:36 frankmorgner
+
+ * configure.ac: added maintainer
+
+2010-05-08 14:44 frankmorgner
+
+ * src/scutil.c, src/scutil.h, src/sm.c, src/sm.h: moved bin_log to
+ scutil
+
+2010-05-08 07:19 frankmorgner
+
+ * README: updated informations about pace-tool
+
+2010-05-07 21:27 frankmorgner
+
+ * configure.ac: corrected configure output
+
+2010-05-07 19:03 frankmorgner
+
+ * INSTALL, configure.ac: removed unmodified file
+
+2010-05-07 18:02 frankmorgner
+
+ * src/pace.c: added _essential_ missing file
+
+2010-05-07 14:30 frankmorgner
+
+ * Makefile.am: added missing file
+
+2010-05-07 11:50 frankmorgner
+
+ * ChangeLog, INSTALL, Makefile, NEWS, binutil.c, binutil.h, ccid.c,
+ ccid.h, configure.ac, m4, m4/Makefile.am, m4/acx_pthread.m4,
+ pace-tool.c, pace.c, pace.h, pace_lib.c, pace_lib.h, scutil.c,
+ scutil.h, sm.c, sm.h, src, src/Makefile.am, src/binutil.c,
+ src/binutil.h, src/ccid.c, src/ccid.h, src/pace-tool.c,
+ src/pace.h, src/pace_lib.c, src/pace_lib.h, src/scutil.c,
+ src/scutil.h, src/sm.c, src/sm.h, src/usb.c, src/usbstring.c,
+ src/usbstring.h, usb.c, usbstring.c, usbstring.h: fixed include
+ in pace.c. switched to autotools
+
+2010-05-05 14:38 frankmorgner
+
+ * Makefile, binutil.c, binutil.h, ccid.c, pace-tool.c, scutil.c,
+ scutil.h, usb.c, util.c, util.h: split up utils into stuff for
+ program and sc handling
+
+2010-05-04 21:01 frankmorgner
+
+ * pace-tool.c, pace.c, pace.h: cleaned up pace.c and moved
+ test_pace to pace-tool.c
+
+2010-05-04 20:16 frankmorgner
+
+ * Makefile, pace-tool.c, pace.c: openpace is now a hard dependancy
+ for pace-tool. ccid does not yet depend on pace, since the USB
+ interface to pace is not yet defined.
+
+2010-05-04 20:03 frankmorgner
+
+ * Makefile, ccid.c, ccid.h, pace-tool.c, pace.c, usb.c, util.c,
+ util.h: cleaned up command line options of pace-tool and made it
+ independant from ccid
+
+2010-05-04 08:07 frankmorgner
+
+ * pace.c, sm.c: bugfix: initializing apdu in pace_gen_auth. bin_log
+ now checks input data.
+
+2010-05-04 07:57 frankmorgner
+
+ * pace.c: changed length of read binary apdu to support acr 122
+
+2010-05-03 19:52 frankmorgner
+
+ * Makefile, pace-tool.c, usb.c, util.c, util.h: put static pace
+ functionality into the new program pace-tool
+
+2010-05-03 13:46 frankmorgner
+
+ * pace.c: the number of remaining retries is a warning from the
+ card, not a fatal error
+
+2010-04-29 07:33 frankmorgner
+
+ * pace.c: using proper type for getline result
+
+2010-04-28 13:14 frankmorgner
+
+ * ccid.c, ccid.h, pace.c, pace.h, usb.c: added support for changing
+ CAN and PIN for PACE
+
+2010-04-27 20:02 frankmorgner
+
+ * INSTALL: updated instructions
+
+2010-04-27 20:00 frankmorgner
+
+ * Makefile, ccid.c, pace.c, sm.c, usb.c: - sm will yield error when
+ the class byte indicates a sm apdu and pace will
+ simply transmit the apdu without encrypting/authenticating it.
+ - fixed building process when compiling without pace
+
+2010-04-19 18:12 frankmorgner
+
+ * Makefile, ccid.c, ccid.h, usb.c: added option to select card
+ driver. beautified usage dialog.
+
+2010-04-16 20:37 frankmorgner
+
+ * Makefile: improved build process
+
+2010-04-16 18:18 frankmorgner
+
+ * usb.c: improved option parsing
+
+2010-04-16 14:08 frankmorgner
+
+ * ccid.c, ccid.h, usb.c: added option to scan for available readers
+
+2010-04-15 20:03 frankmorgner
+
+ * Makefile, pace.h, pace_lib.c, pace_lib.h: added header file for
+ pace library functions
+
+2010-04-15 18:37 frankmorgner
+
+ * Makefile, README, apdu.c, apdu.h, pace.c, sm.c: - added
+ information about opensc
+ - using sc_transmit_apdu instead of my_transmit_apdu. fixing the
+ opensc error
+ is the better solution than implementing it twice (see
+ http://www.opensc-project.org/opensc/ticket/209)
+
+2010-04-15 07:41 frankmorgner
+
+ * README: updated information
+
+2010-04-15 07:37 frankmorgner
+
+ * README, ccid.c, ccid.h, pace.c, pace.h, sm.c, sm.h, usb.c: -
+ Fixed error when testing pace without card
+ - Testing pace allows now to choose the type of the secret (mrz,
+ pin, can, puk).
+ The secret can be given as commandline option or interactively.
+ - Cleaned prompt for getting the password
+ - Fixed error when inserting an empty password
+ - When PACE is successfully finished, APDUs for testing can be
+ given
+ interactively
+
+2010-04-13 21:06 frankmorgner
+
+ * pace.c, pace.h, sm.c: - completed mac verification. sm with pace
+ is now fully functional.
+ - made pace_test more fault tolerant.
+
+2010-04-12 21:22 frankmorgner
+
+ * pace.c, sm.c: - decryption of sm apdu now working. verification
+ of mac still missing.
+
+2010-04-12 19:54 frankmorgner
+
+ * ccid.c, pace.c, sm.c, usb.c: fixed various memory leaks and
+ potential segfaults
+
+2010-04-12 14:26 frankmorgner
+
+ * pace.c, pace.h, pace_lib.c: - protocol nid in pace_sm_ctx is not
+ needed any longer due to the changes of OpenPACE
+
+2010-04-12 14:04 frankmorgner
+
+ * pace.c, sm.c: bugfixes:
+ - sm.c: fixed mac data padding, when sending sm apdu without
+ data.
+ - pace.c: for iv calculation ecb is used instead of cbc
+ - pace.c: fixed ssc incrementation
+
+2010-04-12 12:09 frankmorgner
+
+ * pace.c, pace.h: - trying new apdu to reset retry counter in
+ pace_test
+ - added pace wrapper for sm_transmit_apdu which automatically
+ increments the ssc
+
+2010-04-12 10:31 frankmorgner
+
+ * pace.c: added missing include
+
+2010-04-12 07:34 frankmorgner
+
+ * pace.c: added code for reading cardsecurity
+
+2010-04-12 07:23 frankmorgner
+
+ * sm.c: - reverted changes from last commit
+
+2010-04-12 07:18 frankmorgner
+
+ * sm.c: - added more debugging
+ - bugfix: header of sm apdu is authenticated instead of the
+ original apdu
+
+2010-04-11 21:06 frankmorgner
+
+ * pace.c: bugfix: fetching unhandled error in update_iv
+
+2010-04-11 20:49 frankmorgner
+
+ * sm.c, sm.h: made bin_log more verbose
+
+2010-04-11 20:31 frankmorgner
+
+ * pace.c, pace.h, pace_lib.c, sm.c: Bugfixes:
+ - ssc is a BIGNUM, since its size can be up to 16 bytes (not 16
+ bits as before)
+ - protected le is now encoded as octet string (not as unsigned
+ integer anymore)
+ - sc_format_asn1_entry was fet with wrong pointers (lebuf instead
+ of *lebuf
+ and formatted_data instead of *formatted_data
+
+ Added some debug output.
+
+2010-04-10 20:39 frankmorgner
+
+ * sm.c, sm.h: made sm code independant from openssl
+
+2010-04-10 18:16 frankmorgner
+
+ * ccid.c, pace.c, sm.c, sm.h: - pace.c: removed unused variable ssc
+ - pace.c: bugfix: don't increment ssc when resetting it.
+ - sm.c/.h: wrote wrapper sm_transmit_apdu
+ - sm.c: removed sm error handling, should be done by sc_check_sw
+ - sm.c/ccid.c/pace.c: added qualifier "static" to local functions
+
+2010-04-10 17:00 frankmorgner
+
+ * pace.c, sm.c, sm.h: added sw checking for sm
+
+2010-04-10 15:12 frankmorgner
+
+ * pace.c, sm.c: added missing return buffer for select of
+ CardSecurity
+
+2010-04-10 14:53 frankmorgner
+
+ * pace.c, pace.h, sm.c: - sm.c (sm_encrypt) fixed header of sm apdu
+ - pace.c (EstablishPACEChannel) Fixed initialisation of
+ authentication_ctx.
+ (pace_test) Fixed usage of SC_TEST_RET and initialisation of
+ select apdu for
+ EF.CardSecurity.
+
+2010-04-09 20:36 frankmorgner
+
+ * Makefile, apdu.h, ccid.c, ccid.h, pace.c, pace.h, pace_lib.c,
+ sm.c, sm.h, utils.c, utils.h: - Work in progress: Almost finished
+ (hopefully) flexible sm implementation
+ (untested). struct sm_ctx needs external cipher and
+ authentication
+ implementations. Here only routines for
+ encryption/decryption/authentication
+ with PACE are given.
+
+2010-04-01 05:52 frankmorgner
+
+ * ccid.c, pace.c, pace.h, sm.h: integrated SM into pace
+
+2010-03-31 21:58 frankmorgner
+
+ * sm.c, sm.h, utils.c, utils.h: - added untested function to
+ decrypt sm
+ - function cipher now always disables automatic padding
+
+2010-03-29 19:53 frankmorgner
+
+ * Makefile, sm.c, sm.h, utils.c, utils.h: - Added an untested SM
+ implementation, currently only with encryption
+ - Added utils from OpenPACE
+
+2010-03-22 14:42 frankmorgner
+
+ * pace.c: adapted latest changes of OpenPACE
+
+2010-03-15 18:34 frankmorgner
+
+ * pace.c: bugfix: corrected types of fields from ASN1_INTEGER to
+ ASN1_OCTET_STRING
+
+2010-03-15 15:01 frankmorgner
+
+ * pace.c: - adopted the latest changes of OpenPACE
+ - bugfix: created receive buffer before sending general
+ authenticate apdus
+ - added more debug output
+
+2010-03-10 09:14 frankmorgner
+
+ * apdu.c, apdu.h: bugfix
+
+2010-03-09 19:30 frankmorgner
+
+ * pace.c: using specifications from TR-03110 2.01 as default (as
+ done by test
+ cards)
+
+2010-03-09 07:01 frankmorgner
+
+ * Makefile: bugfix: building with apdu.c apdu.h
+
+2010-03-08 22:16 frankmorgner
+
+ * apdu.c, apdu.h, pace.c: - bugfix: general authenticate response
+ data is now encapsulated in a
+ dynamic data object
+ - added more debug messages
+ - bugfix: get_ef_card_access didn't fetch the whole file
+ - bugfix: set mse set at apdu type to case 3
+ - bugfix: only send the plain value (without tag/length) of the
+ PACE_MSE_SET_AT object
+ - bugfix: fixed general authenticate cla byte and set apdu type
+ to
+ case 4
+ - sanity checks in sc_transmit_apdu forbid the required apdu
+ format of
+ general authenticate so it had to be reimplemented in
+ my_transmit_apdu. apdu.c/apdu.h are mainly copied from opensc.
+
+2010-03-05 22:35 frankmorgner
+
+ * pace.c, pace.h: - fixed includes
+ - fixed return value from pace_test if NO_PACE is defined
+
+2010-03-05 09:53 frankmorgner
+
+ * ccid.c, ccid.h, pace.c, pace.h, usb.c: - pace-testing is not done
+ in threads anymore, program exits when test is finished
+ - bugfix in debug_ossl
+ - more generic aproach to select EF.CardAccess
+ - EF.CardAccess is read sequencially, to get a correct send
+ sequence counter
+
+2010-03-01 16:22 frankmorgner
+
+ * ccid.c, ccid.h, pace.c, pace.h, usb.c: - bugfix: moved ASN.1
+ declaration of PACE-APDUs to pace.c
+ - added commandline-option to test PACE currently with hard coded
+ secret etc.
+
+2010-02-28 18:58 frankmorgner
+
+ * INSTALL, Makefile, README, ccid.c, pace.c, pace.h: Added support
+ for Password Authenticated Connection Establishment (PACE) using
+ OpenPACE (http://sourceforge.net/projects/openpace/). Since it is
+ currently
+ untested, it is disabled by default.
+
+2010-01-31 15:57 frankmorgner
+
+ * usb.c: - implemented option parsing with getopt_long
+
+2010-01-31 01:47 frankmorgner
+
+ * ccid.c: - Some minor code improvements: catch and fix some rare
+ errors, taking more
+ usage of opensc debugging methods, removed not needed variables
+ and code
+ fragments
+
+2010-01-30 11:52 frankmorgner
+
+ * ccid.c, usb.c: - fixed segmentation fault, ccid running stable
+ now again
+
+2010-01-30 02:43 frankmorgner
+
+ * ccid.c: - switched to opensc's debugging function in log.h
+ - a segmentation fault of unknown origin crashes ccid after too
+ many
+ operations. last stable version is revision 29.
+
+2010-01-30 00:04 frankmorgner
+
+ * ccid.c: - created detect_card_presence to avoid limitations of
+ sc_detect_card_presence
+
+2010-01-29 18:04 frankmorgner
+
+ * ccid.c, ccid.h, usb.c: - added functions for simplified debugging
+ - changed functions to pass pointers instead of structs and using
+ realloc
+ instead of malloc to reduce memory overhead/usage
+ - changed functions to return opensc-errors to pass
+ printout-debugging to the
+ top level
+ - included functionality of get_RDR_to_PC_Parameters in
+ perform_PC_to_RDR_GetParamters
+
+2010-01-24 07:13 frankmorgner
+
+ * ccid.c, ccid.h: added support for bNumberMessage
+
+2010-01-23 22:45 frankmorgner
+
+ * ccid.c: added support for flags in bConfirmPIN
+
+2010-01-23 22:10 frankmorgner
+
+ * ccid.c: added support for pin modification
+
+2010-01-23 21:37 frankmorgner
+
+ * ccid.c, ccid.h, usb.c: - added defines for pin modification
+ - debugging apdu and rapdu there where they are created
+ - splitted pin block operations into several functions
+
+2010-01-21 21:48 frankmorgner
+
+ * Makefile, ccid.c, ccid.h, usb.c: - switched from libpcsc to
+ libopensc. This brings some new features:
+ - Support for 4 slots per reader
+ - abstraction of user interface
+ - interactive pin verification
+ - BCD encoding of PIN
+ - Support for new readers (OpenCT)
+ - automatically skip to a reader with a card
+ - added defines
+ - changed interface of ccid_initialize
+
+2010-01-14 22:29 frankmorgner
+
+ * ccid.c, ccid.h, usb.c: changed naming
+
+2010-01-14 20:28 frankmorgner
+
+ * usb.c: removed not needed iso-identifier
+
+2010-01-14 19:20 frankmorgner
+
+ * Makefile, ccid.c, ccid.h, usb.c: code split into multiple files,
+ added include guards
+
+2010-01-12 10:06 frankmorgner
+
+ * ccid.h: perform_PC_to_RDR_Secure works, read actual PIN is still
+ missing
+
+2010-01-10 23:09 frankmorgner
+
+ * ccid.h: added support for pinpad. doesn't work atm, somehow
+ abPINApdu is wrong.
+
+2010-01-05 18:44 frankmorgner
+
+ * ccid.c, ccid.h: changed vendorid/productid, added new structures
+ for future PIN support.
+
+2010-01-04 20:38 frankmorgner
+
+ * ccid.c: Cleaned up warnings.
+
+2010-01-04 19:48 frankmorgner
+
+ * ccid.bb: Separated bitbake recipes. vscarchitecture.bb simply
+ collects the other recipes now.
+
+2009-08-06 20:25 schertz123456
+
+ * ., AUTHORS, COPYING, INSTALL, Makefile, README, ccid.bb, ccid.c,
+ ccid.h, usbstring.c, usbstring.h: Initial commit.
+
diff --git a/npa/Doxyfile.in b/npa/Doxyfile.in
new file mode 100644
index 0000000..6362086
--- /dev/null
+++ b/npa/Doxyfile.in
@@ -0,0 +1,10 @@
+PROJECT_NAME = @PACKAGE_NAME@
+PROJECT_NUMBER = @PACKAGE_VERSION@
+OUTPUT_DIRECTORY = @builddir@/doc
+STRIP_FROM_PATH = @top_srcdir@/src
+INPUT = @top_srcdir@/src @top_srcdir@/README.dox
+FILE_PATTERNS = *.c *.h
+RECURSIVE = YES
+EXAMPLE_PATH = @top_srcdir@/src
+GENERATE_HTML = YES
+GENERATE_TAGFILE = @builddir@/doc/$(PROJECT).tag
diff --git a/npa/Makefile.am b/npa/Makefile.am
new file mode 100644
index 0000000..ed6f810
--- /dev/null
+++ b/npa/Makefile.am
@@ -0,0 +1,33 @@
+ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = src m4
+
+DISTCLEANFILES = Doxyfile libpace.pc
+
+EXTRA_DIST = README.dox libpace.pc.in Doxyfile.in
+
+do_subst = sed \
+ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \
+ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
+ -e 's,[@]builddir[@],$(builddir),g' \
+ -e 's,[@]prefix[@],$(prefix),g' \
+ -e 's,[@]exec_prefix[@],$(exec_prefix),g' \
+ -e 's,[@]libdir[@],$(libdir),g' \
+ -e 's,[@]includedir[@],$(includedir),g' \
+ -e 's,[@]VERSION[@],$(VERSION),g' \
+ -e 's,[@]top_srcdir[@],$(top_srcdir),g'
+
+if DOC_ENABLED
+clean-local:
+ rm -rf doc
+
+doc :
+ $(do_subst) < $(srcdir)/Doxyfile.in > Doxyfile
+ $(DOXYGEN) Doxyfile
+
+.PHONY: doc
+endif
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libpace.pc
+libpace.pc :
+ $(do_subst) < $(srcdir)/libpace.pc.in > libpace.pc
diff --git a/npa/NEWS b/npa/NEWS
new file mode 100644
index 0000000..e69de29
diff --git a/npa/README b/npa/README
new file mode 120000
index 0000000..68c0c3b
--- /dev/null
+++ b/npa/README
@@ -0,0 +1 @@
+README.dox
\ No newline at end of file
diff --git a/npa/README.dox b/npa/README.dox
new file mode 100644
index 0000000..fc88cfa
--- /dev/null
+++ b/npa/README.dox
@@ -0,0 +1,72 @@
+/** @mainpage
+
+Welcome to ccid. The purpose of ccid is to forward a PCSC smartcard reader
+as a standard USB CCID reader. If the host system is in USB device mode, ccid
+forwards the local reader via USB to an other device. If in USB host mode,
+ccid virtually plugges in a USB CCID reader to the host system.
+
+ccid is implemented using GadgetFS. Some fragments of the source code is based
+on the GadgetFS example at http://www.linux-usb.org/gadget/ and on the source
+code of the OpenSC tools.
+
+pace-tool has support for Password Authenticated Connection Establishment
+(PACE) using OpenPACE (see http://sourceforge.net/projects/openpace/).
+pace-tool can be used for PIN management or to encrypt APDUs inside a secure
+messaging channel established with PACE. PACE is experimental and disabled by
+default.
+
+
+@section i INSTALLATION
+
+See file INSTALL.
+
+
+@subsection g HINTS ON GADGETFS
+
+To create an USB Gadget in both USB host and USB client mode, you need to load
+the kernel module gadgetfs. A guide focused on Debian based systems to run and
+compile gadgetfs, you can find here:
+http://wiki.openmoko.org/wiki/Building_Gadget_USB_Module
+
+On OpenMoko it is likely, that you need to patch your kernel (see
+http://docs.openmoko.org/trac/ticket/2206). If you also want to switch multiple
+times between gadgetfs and g_ether an other patch is needed (see
+https://docs.openmoko.org/trac/ticket/2240).
+
+If you only use pace-tool for testing your card, you don't need gadgetfs.
+
+
+@subsection o HINTS ON OPENSC
+
+With PACE support enabled OpenSC older than r4244 will yield something like
+this error:
+
+[default] apdu.c:341:sc_check_apdu: Invalid Case 4 short APDU:
+cse=04 cla=10 ins=86 p1=00 p2=00 lc=2 le=0
+resp=0x10353c0 resplen=256 data=0x1034a30 datalen=2
+[default] pace.c:1110:EstablishPACEChannel: Could not get encrypted nonce from card (General Authenticate step 1 failed).
+
+It requires the following patch:
+http://www.opensc-project.org/opensc/raw-attachment/ticket/209/le0.patch
+
+The following patch makes the hex dumped output more readable:
+http://www.opensc-project.org/opensc/raw-attachment/ticket/263/hex_dump_align.patch
+
+
+@section u USAGE
+
+When testing PACE with either PIN, CAN, MRZ or PUK run pace-tool. Here you can
+enter APDUs which are to be converted according to the secure messaging
+parameter and to be sent to the card. Herefor insert the APDU in hex (upper or
+lower case) with a colon to separate the bytes or without it. Example APDUs can
+be found in the file apdus.
+To pass a secret to pace-tool, the command line parameters or the environment
+variables PIN/CAN/MRZ/PUK/NEWPIN can be used. If none of these options is used,
+pace-tool will show a password prompt.
+
+
+@section q QUESTIONS
+For questions, please use http://sourceforge.net/projects/vsmartcard/support
+
+@author Frank Morgner
+*/
diff --git a/npa/configure.ac b/npa/configure.ac
new file mode 100644
index 0000000..2e77890
--- /dev/null
+++ b/npa/configure.ac
@@ -0,0 +1,117 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.63])
+AC_INIT([libpace], [0.1], [http://sourceforge.net/projects/vsmartcard/support])
+AC_CONFIG_SRCDIR([src/pace.c])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_LIBTOOL
+AC_PROG_RANLIB
+AM_PROG_CC_C_O
+PKG_PROG_PKG_CONFIG
+
+# Checks for libraries.
+PKG_CHECK_EXISTS([libopensc],
+ [PKG_CHECK_MODULES([OPENSC], [libopensc])],
+ [AC_MSG_WARN([libopensc not found by pkg-config])])
+PKG_CHECK_EXISTS([libssl],
+ [PKG_CHECK_MODULES([OPENSSL], [libssl])],
+ [AC_MSG_WARN([libssl not found by pkg-config])])
+
+
+saved_CPPFLAGS="$CPPFLAGS"
+saved_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $OPENSC_CFLAGS $OPENSSL_CFLAGS"
+LIBS="$LDFLAGS $OPENSC_LIBS $OPENSSL_LIBS"
+
+AC_CHECK_HEADERS(opensc/opensc.h,,
+ [ AC_MSG_ERROR([opensc/opensc.h not found, install libopensc or use ./configure OPENSC_CFLAGS=...]) ])
+AC_MSG_CHECKING([for sc_context_create])
+AC_TRY_LINK_FUNC(sc_context_create, [ AC_MSG_RESULT([yes]) ],
+ [ AC_MSG_ERROR([libopensc not found, use ./configure OPENSC_LIBS=...]) ])
+
+AC_CHECK_HEADERS(openssl/evp.h, [], [ AC_MSG_ERROR([openssl/evp.h not found, install OpenSSL or use ./configure OPENSSL_CFLAGS=...]) ])
+AC_MSG_CHECKING([for EVP_read_pw_string_min])
+AC_TRY_LINK_FUNC(EVP_read_pw_string_min, [ AC_MSG_RESULT([yes]) ], [ AC_MSG_ERROR([OpenSSL not found, use ./configure OPENSSL_LIBS=...]) ])
+
+AC_CHECK_HEADERS(openssl/pace.h, [], [ AC_MSG_ERROR([openssl/pace.h not found, install OpenPACE or use ./configure OPENSSL_CFLAGS=...]) ])
+AC_MSG_CHECKING([for parse_ef_card_access])
+AC_TRY_LINK_FUNC(parse_ef_card_access, [ AC_MSG_RESULT([yes]) ], [ AC_MSG_ERROR([OpenPACE not found, use ./configure OPENSSL_LIBS=...]) ])
+
+CPPFLAGS="$saved_CPPFLAGS"
+LIBS="$saved_LIBS"
+AC_SUBST(OPENSSL_CFLAGS)
+AC_SUBST(OPENSSL_LIBS)
+
+AC_DEFINE(BUERGERCLIENT_WORKAROUND, 1, [Always get EF.CardAccess, when connecting to a smart card. This is a workaround for the recent Buergerclient])
+
+
+# Documentation (default: no)
+AC_ARG_ENABLE([doc],AS_HELP_STRING([--enable-doc],[Enable documentation generation.]),[enable_doc=$enableval],[enable_doc="no"])
+if test x"$enable_doc" = "xyes"
+then
+ AC_PATH_PROG([DOXYGEN], [doxygen])
+ if test x$DOXYGEN = x
+ then
+ AC_MSG_ERROR([doxygen is mandatory.])
+ fi
+fi
+AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes])
+
+
+# Checks for header files.
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h memory.h stdint.h stdlib.h string.h sys/ioctl.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_INLINE
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT8_T
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([memmove memset strerror])
+
+cat << EOF
+
+${PACKAGE} has been configured with following options:
+
+Version: ${PACKAGE_VERSION}
+User binaries: $(eval eval eval echo "${bindir}")
+Libraries: $(eval eval eval echo "${libdir}")
+Configuration files: $(eval eval eval echo "${sysconfdir}")
+
+
+Host: ${host}
+Compiler: ${CC}
+Preprocessor flags: ${CPPFLAGS}
+Compiler flags: ${CFLAGS}
+Preprocessor flags: ${CPPFLAGS}
+Linker flags: ${LDFLAGS}
+Libraries: ${LIBS}
+OPENSC_CFLAGS: ${OPENSC_CFLAGS}
+OPENSC_LIBS: ${OPENSC_LIBS}
+OPENSSL_CFLAGS: ${OPENSSL_CFLAGS}
+OPENSSL_LIBS: ${OPENSSL_LIBS}
+
+Documentation: ${enable_doc}
+
+EOF
+
+AC_CONFIG_FILES([
+ Makefile
+ m4/Makefile
+ src/Makefile
+ ])
+AC_OUTPUT
diff --git a/ccid/libpace.pc.in b/npa/libpace.pc.in
similarity index 100%
rename from ccid/libpace.pc.in
rename to npa/libpace.pc.in
diff --git a/npa/m4/Makefile.am b/npa/m4/Makefile.am
new file mode 100644
index 0000000..58bdc59
--- /dev/null
+++ b/npa/m4/Makefile.am
@@ -0,0 +1,3 @@
+# Process this file with automake to create Makefile.in
+
+EXTRA_DIST = acx_pthread.m4
diff --git a/npa/src/Makefile.am b/npa/src/Makefile.am
new file mode 100644
index 0000000..49931a5
--- /dev/null
+++ b/npa/src/Makefile.am
@@ -0,0 +1,24 @@
+AM_CPPFLAGS = -I$(top_srcdir)/src/pace -I$(top_builddir)/src/pace
+
+libpace_la_SOURCES = sm.c scutil.c pace.c pace_lib.c
+libpace_la_LIBADD = $(OPENSC_LIBS) $(OPENSSL_LIBS)
+libpace_la_CFLAGS = $(OPENSC_CFLAGS) $(OPENSSL_CFLAGS)
+
+pace_tool_SOURCES = pace-tool.c binutil.c
+pace_tool_LDADD = $(OPENSC_LIBS) $(OPENSSL_LIBS) libpace.la
+pace_tool_CFLAGS = $(OPENSC_CFLAGS) $(OPENSSL_CFLAGS)
+noinst_HEADERS = \
+ binutil.h
+
+flaw:
+ flawfinder -SQD *.h *.c
+
+bin_PROGRAMS = pace-tool
+
+lib_LTLIBRARIES = libpace.la
+
+nobase_include_HEADERS = \
+ pace/sm.h \
+ pace/pace.h \
+ pace/scutil.h \
+ pace/pace_lib.h
diff --git a/npa/src/binutil.c b/npa/src/binutil.c
new file mode 120000
index 0000000..302cf29
--- /dev/null
+++ b/npa/src/binutil.c
@@ -0,0 +1 @@
+../../ccid/src/binutil.c
\ No newline at end of file
diff --git a/npa/src/binutil.h b/npa/src/binutil.h
new file mode 120000
index 0000000..b865ace
--- /dev/null
+++ b/npa/src/binutil.h
@@ -0,0 +1 @@
+../../ccid/src/binutil.h
\ No newline at end of file
diff --git a/ccid/src/pace-tool.c b/npa/src/pace-tool.c
similarity index 100%
rename from ccid/src/pace-tool.c
rename to npa/src/pace-tool.c
diff --git a/ccid/src/pace.c b/npa/src/pace.c
similarity index 100%
rename from ccid/src/pace.c
rename to npa/src/pace.c
diff --git a/ccid/src/pace/pace.h b/npa/src/pace/pace.h
similarity index 100%
rename from ccid/src/pace/pace.h
rename to npa/src/pace/pace.h
diff --git a/ccid/src/pace/pace_lib.h b/npa/src/pace/pace_lib.h
similarity index 100%
rename from ccid/src/pace/pace_lib.h
rename to npa/src/pace/pace_lib.h
diff --git a/ccid/src/pace/scutil.h b/npa/src/pace/scutil.h
similarity index 100%
rename from ccid/src/pace/scutil.h
rename to npa/src/pace/scutil.h
diff --git a/ccid/src/pace/sm.h b/npa/src/pace/sm.h
similarity index 100%
rename from ccid/src/pace/sm.h
rename to npa/src/pace/sm.h
diff --git a/ccid/src/pace_lib.c b/npa/src/pace_lib.c
similarity index 100%
rename from ccid/src/pace_lib.c
rename to npa/src/pace_lib.c
diff --git a/npa/src/scutil.c b/npa/src/scutil.c
new file mode 100644
index 0000000..74ae556
--- /dev/null
+++ b/npa/src/scutil.c
@@ -0,0 +1,267 @@
+/*
+ * Copyright (C) 2010 Frank Morgner
+ *
+ * This file is part of ccid.
+ *
+ * ccid is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * ccid is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * ccid. If not, see .
+ */
+#include "scutil.h"
+#include
+#include
+#include
+
+int initialize(int reader_id, const char *cdriver, int verbose,
+ sc_context_t **ctx, sc_reader_t **reader)
+{
+ unsigned int i, reader_count;
+
+ if (!ctx || !reader)
+ return SC_ERROR_INVALID_ARGUMENTS;
+
+ int r = sc_context_create(ctx, NULL);
+ if (r < 0) {
+ printf("Failed to create initial context: %s", sc_strerror(r));
+ return r;
+ }
+
+ if (cdriver != NULL) {
+ r = sc_set_card_driver(*ctx, cdriver);
+ if (r < 0) {
+ sc_error(*ctx, "Card driver '%s' not found!\n", cdriver);
+ return r;
+ }
+ }
+
+ (*ctx)->debug = verbose;
+
+ reader_count = sc_ctx_get_reader_count(*ctx);
+
+ if (reader_count == 0)
+ return SC_ERROR_NO_READERS_FOUND;
+
+ if (reader_id < 0) {
+ /* Automatically try to skip to a reader with a card if reader not specified */
+ for (i = 0; i < reader_count; i++) {
+ *reader = sc_ctx_get_reader(*ctx, i);
+ if (sc_detect_card_presence(*reader, 0) & SC_SLOT_CARD_PRESENT) {
+ reader_id = i;
+ sc_debug(*ctx, "Using the first reader with a card: %s", (*reader)->name);
+ break;
+ }
+ }
+ if (reader_id >= reader_count) {
+ sc_debug(*ctx, "No card found, using the first reader.");
+ reader_id = 0;
+ }
+ }
+
+ if (reader_id >= reader_count)
+ return SC_ERROR_NO_READERS_FOUND;
+
+ *reader = sc_ctx_get_reader(*ctx, reader_id);
+
+ return SC_SUCCESS;
+}
+
+
+int build_apdu(sc_context_t *ctx, const u8 *buf, size_t len, sc_apdu_t *apdu)
+{
+ const u8 *p;
+ size_t len0;
+
+ if (!buf || !apdu)
+ return SC_ERROR_INVALID_ARGUMENTS;
+
+ len0 = len;
+ if (len < 4) {
+ sc_error(ctx, "APDU too short (must be at least 4 bytes)");
+ return SC_ERROR_INVALID_DATA;
+ }
+
+ memset(apdu, 0, sizeof *apdu);
+ p = buf;
+ apdu->cla = *p++;
+ apdu->ins = *p++;
+ apdu->p1 = *p++;
+ apdu->p2 = *p++;
+ len -= 4;
+ if (!len) {
+ apdu->cse = SC_APDU_CASE_1;
+ } else {
+ if (*p == 0 && len >= 3) {
+ /* ...must be an extended APDU */
+ p++;
+ if (len == 3) {
+ apdu->le = (*p++)<<8;
+ apdu->le += *p++;
+ if (apdu->le == 0)
+ apdu->le = 0xffff+1;
+ len -= 3;
+ apdu->cse = SC_APDU_CASE_2_EXT;
+ } else {
+ /* len > 3 */
+ apdu->lc = (*p++)<<8;
+ apdu->lc += *p++;
+ len -= 3;
+ if (len < apdu->lc) {
+ sc_error(ctx, "APDU too short (need %lu more bytes)\n",
+ (unsigned long) apdu->lc - len);
+ return SC_ERROR_INVALID_DATA;
+ }
+ apdu->data = p;
+ apdu->datalen = apdu->lc;
+ len -= apdu->lc;
+ p += apdu->lc;
+ if (!len) {
+ apdu->cse = SC_APDU_CASE_3_EXT;
+ } else {
+ /* at this point the apdu has a Lc, so Le is on 2 bytes */
+ if (len < 2) {
+ sc_error(ctx, "APDU too short (need 2 more bytes)\n");
+ return SC_ERROR_INVALID_DATA;
+ }
+ apdu->le = (*p++)<<8;
+ apdu->le += *p++;
+ if (apdu->le == 0)
+ apdu->le = 0xffff+1;
+ len -= 2;
+ apdu->cse = SC_APDU_CASE_4_EXT;
+ }
+ }
+ } else {
+ /* ...must be a short APDU */
+ if (len == 1) {
+ apdu->le = *p++;
+ if (apdu->le == 0)
+ apdu->le = 0xff+1;
+ len--;
+ apdu->cse = SC_APDU_CASE_2_SHORT;
+ } else {
+ apdu->lc = *p++;
+ len--;
+ if (len < apdu->lc) {
+ sc_error(ctx, "APDU too short (need %lu more bytes)\n",
+ (unsigned long) apdu->lc - len);
+ return SC_ERROR_INVALID_DATA;
+ }
+ apdu->data = p;
+ apdu->datalen = apdu->lc;
+ len -= apdu->lc;
+ p += apdu->lc;
+ if (!len) {
+ apdu->cse = SC_APDU_CASE_3_SHORT;
+ } else {
+ apdu->le = *p++;
+ if (apdu->le == 0)
+ apdu->le = 0xff+1;
+ len--;
+ apdu->cse = SC_APDU_CASE_4_SHORT;
+
+ }
+ }
+ }
+ if (len) {
+ sc_error(ctx, "APDU too long (%lu bytes extra)\n",
+ (unsigned long) len);
+ return SC_ERROR_INVALID_DATA;
+ }
+ }
+
+ apdu->flags = SC_APDU_FLAGS_NO_GET_RESP|SC_APDU_FLAGS_NO_RETRY_WL;
+
+ sc_debug(ctx, "Case %d %s APDU, %lu bytes:\tins=%02x p1=%02x p2=%02x lc=%04x le=%04x",
+ apdu->cse & SC_APDU_SHORT_MASK,
+ (apdu->cse & SC_APDU_EXT) != 0 ? "extended" : "short",
+ (unsigned long) len0, apdu->ins, apdu->p1, apdu->p2, apdu->lc, apdu->le);
+
+ return SC_SUCCESS;
+}
+
+void _bin_log(sc_context_t *ctx, int type, const char *file, int line,
+ const char *func, const char *label, const u8 *data, size_t len,
+ FILE *f)
+{
+ /* this is the maximum supported by sc_do_log_va */
+ /* Flawfinder: ignore */
+ char buf[1800];
+
+ if (data)
+ sc_hex_dump(ctx, data, len, buf, sizeof buf);
+ else
+ buf[0] = 0;
+ if (!f) {
+ sc_do_log(ctx, type, file, line, func,
+ "\n%s (%u byte%s):\n%s",
+ label, len, len==1?"":"s", buf);
+ } else {
+ fprintf(f, "%s (%u byte%s):\n%s",
+ label, len, len==1?"":"s", buf);
+ }
+}
+
+static int list_drivers(sc_context_t *ctx)
+{
+ int i;
+
+ if (ctx->card_drivers[0] == NULL) {
+ printf("No card drivers installed!\n");
+ return 0;
+ }
+ printf("Configured card drivers:\n");
+ for (i = 0; ctx->card_drivers[i] != NULL; i++) {
+ printf(" %-16s %s\n", ctx->card_drivers[i]->short_name,
+ ctx->card_drivers[i]->name);
+ }
+
+ return 0;
+}
+
+static int list_readers(sc_context_t *ctx)
+{
+ unsigned int i, rcount = sc_ctx_get_reader_count(ctx);
+
+ if (rcount == 0) {
+ printf("No smart card readers found.\n");
+ return 0;
+ }
+ printf("Readers known about:\n");
+ printf("Nr. Driver Name\n");
+ for (i = 0; i < rcount; i++) {
+ sc_reader_t *screader = sc_ctx_get_reader(ctx, i);
+ printf("%-7d%-11s%s\n", i, screader->driver->short_name,
+ screader->name);
+ }
+
+ return 0;
+}
+
+int print_avail(int verbose)
+{
+ sc_context_t *ctx = NULL;
+
+ int r;
+ r = sc_context_create(&ctx, NULL);
+ if (r) {
+ fprintf(stderr, "Failed to establish context: %s\n", sc_strerror(r));
+ return 1;
+ }
+ ctx->debug = verbose;
+
+ r = list_readers(ctx)|list_drivers(ctx);
+
+ if (ctx)
+ sc_release_context(ctx);
+
+ return r;
+}
diff --git a/npa/src/sm.c b/npa/src/sm.c
new file mode 100644
index 0000000..2af45dd
--- /dev/null
+++ b/npa/src/sm.c
@@ -0,0 +1,622 @@
+/*
+ * Copyright (C) 2010 Frank Morgner
+ *
+ * This file is part of ccid.
+ *
+ * ccid is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * ccid is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * ccid. If not, see .
+ */
+#include "scutil.h"
+#include "sm.h"
+#include
+#include
+#include
+#include
+#include
+
+static const struct sc_asn1_entry c_sm_capdu[] = {
+ { "Padding-content indicator followed by cryptogram",
+ SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x07, SC_ASN1_OPTIONAL, NULL, NULL },
+ { "Protected Le",
+ SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x17, SC_ASN1_OPTIONAL, NULL, NULL },
+ { "Cryptographic Checksum",
+ SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x0E, SC_ASN1_OPTIONAL, NULL, NULL },
+ { NULL , 0 , 0 , 0 , NULL , NULL }
+};
+
+static const struct sc_asn1_entry c_sm_rapdu[] = {
+ { "Padding-content indicator followed by cryptogram" ,
+ SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x07, SC_ASN1_OPTIONAL, NULL, NULL },
+ { "Processing Status",
+ SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x19, 0 , NULL, NULL },
+ { "Cryptographic Checksum",
+ SC_ASN1_OCTET_STRING, SC_ASN1_CTX|0x0E, SC_ASN1_OPTIONAL, NULL, NULL },
+ { NULL, 0, 0, 0, NULL, NULL }
+};
+
+static int
+add_iso_pad(const u8 *data, size_t datalen, int block_size, u8 **padded)
+{
+ u8 *p;
+ size_t p_len;
+
+ if (!padded)
+ return SC_ERROR_INVALID_ARGUMENTS;
+
+ /* calculate length of padded message */
+ p_len = (datalen / block_size) * block_size + block_size;
+
+ p = realloc(*padded, p_len);
+ if (!p)
+ return SC_ERROR_OUT_OF_MEMORY;
+
+ if (*padded != data)
+ /* Flawfinder: ignore */
+ memcpy(p, data, datalen);
+
+ *padded = p;
+
+ /* now add iso padding */
+ memset(p + datalen, 0x80, 1);
+ memset(p + datalen + 1, 0, p_len - datalen - 1);
+
+ return p_len;
+}
+
+static int
+add_padding(const struct sm_ctx *ctx, const u8 *data, size_t datalen,
+ u8 **padded)
+{
+ u8 *p;
+
+ switch (ctx->padding_indicator) {
+ case SM_NO_PADDING:
+ if (*padded != data) {
+ p = realloc(*padded, datalen);
+ if (!p)
+ return SC_ERROR_OUT_OF_MEMORY;
+ *padded = p;
+ /* Flawfinder: ignore */
+ memcpy(*padded, data, datalen);
+ }
+ return datalen;
+ case SM_ISO_PADDING:
+ return add_iso_pad(data, datalen, ctx->block_length, padded);
+ default:
+ return SC_ERROR_INVALID_ARGUMENTS;
+ }
+}
+
+static int
+no_padding(u8 padding_indicator, const u8 *data, size_t datalen)
+{
+ if (!datalen || !data)
+ return SC_ERROR_INVALID_ARGUMENTS;
+
+ size_t len;
+
+ switch (padding_indicator) {
+ case SM_NO_PADDING:
+ len = datalen;
+ break;
+ case SM_ISO_PADDING:
+ len = datalen;
+
+ while (len) {
+ len--;
+ if (data[len])
+ break;
+ }
+
+ if (data[len] != 0x80)
+ return SC_ERROR_INVALID_DATA;
+
+ break;
+ default:
+ return SC_ERROR_NOT_SUPPORTED;
+ }
+
+ return len;
+}
+
+static int format_le(size_t le, struct sc_asn1_entry *le_entry,
+ u8 **lebuf, size_t *le_len)
+{
+ u8 *p;
+
+ if (!lebuf || !le_len)
+ return SC_ERROR_INVALID_ARGUMENTS;
+
+ p = realloc(*lebuf, *le_len);
+ if (!p)
+ return SC_ERROR_OUT_OF_MEMORY;
+
+ switch (*le_len) {
+ case 1:
+ p[0] = le;
+ break;
+ case 2:
+ p[0] = htons(le) >> 8;
+ p[1] = htons(le) & 0xff;
+ break;
+ case 3:
+ p[0] = 0x00;
+ p[1] = htons(le) >> 8;
+ p[2] = htons(le) & 0xff;
+ break;
+ default:
+ return SC_ERROR_INVALID_ARGUMENTS;
+ }
+ *lebuf = p;
+
+ sc_format_asn1_entry(le_entry, *lebuf, le_len, SC_ASN1_PRESENT);
+
+ return SC_SUCCESS;
+}
+
+static int prefix_buf(u8 prefix, u8 *buf, size_t buflen, u8 **cat)
+{
+ u8 *p;
+
+ p = realloc(*cat, buflen + 1);
+ if (!p)
+ return SC_ERROR_OUT_OF_MEMORY;
+
+ if (*cat == buf) {
+ memmove(p + 1, p, buflen);
+ } else {
+ /* Flawfinder: ignore */
+ memcpy(p + 1, buf, buflen);
+ }
+ p[0] = prefix;
+
+ *cat = p;
+
+ return buflen + 1;
+}
+
+static int format_data(sc_card_t *card, const struct sm_ctx *ctx,
+ const u8 *data, size_t datalen,
+ struct sc_asn1_entry *formatted_encrypted_data_entry,
+ u8 **formatted_data, size_t *formatted_data_len)
+{
+ int r;
+ u8 *pad_data = NULL;
+ size_t pad_data_len;
+
+ if (!ctx || !formatted_data || !formatted_data_len) {
+ r = SC_ERROR_INVALID_ARGUMENTS;
+ goto err;
+ }
+
+ r = add_padding(ctx, data, datalen, &pad_data);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not add padding to data: %s",
+ sc_strerror(r));
+ goto err;
+ }
+ pad_data_len = r;
+
+ if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "Data to encrypt", pad_data, pad_data_len);
+ r = ctx->encrypt(card, ctx, pad_data, pad_data_len, formatted_data);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not encrypt the data");
+ goto err;
+ }
+ if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "Cryptogram", *formatted_data, r);
+
+ r = prefix_buf(ctx->padding_indicator, *formatted_data, r, formatted_data);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not prepend padding indicator to formatted "
+ "data: %s", sc_strerror(r));
+ goto err;
+ }
+
+ *formatted_data_len = r;
+ sc_format_asn1_entry(formatted_encrypted_data_entry,
+ *formatted_data, formatted_data_len, SC_ASN1_PRESENT);
+
+ r = SC_SUCCESS;
+
+err:
+ if (pad_data) {
+ sc_mem_clear(pad_data, pad_data_len);
+ free(pad_data);
+ }
+
+ return r;
+}
+
+static int format_head(const struct sm_ctx *ctx, const sc_apdu_t *apdu,
+ u8 **formatted_head)
+{
+ if (!apdu || !formatted_head)
+ return SC_ERROR_INVALID_ARGUMENTS;
+
+ u8 *p = realloc(*formatted_head, 4);
+ if (!p)
+ return SC_ERROR_OUT_OF_MEMORY;
+
+ p[0] = apdu->cla;
+ p[1] = apdu->ins;
+ p[2] = apdu->p1;
+ p[3] = apdu->p2;
+ *formatted_head = p;
+
+ return add_padding(ctx, *formatted_head, 4, formatted_head);
+}
+
+static int sm_encrypt(const struct sm_ctx *ctx, sc_card_t *card,
+ const sc_apdu_t *apdu, sc_apdu_t *sm_apdu)
+{
+ struct sc_asn1_entry sm_capdu[4];
+ u8 *p, *le = NULL, *sm_data = NULL, *fdata = NULL, *mac_data = NULL,
+ *asn1 = NULL, *mac = NULL;
+ size_t sm_data_len, fdata_len, mac_data_len, asn1_len, mac_len, le_len;
+ int r;
+
+ if (!apdu || !ctx || !card || !card->slot || !sm_apdu) {
+ r = SC_ERROR_INVALID_ARGUMENTS;
+ goto err;
+ }
+
+ if ((apdu->cla & 0x0C) == 0x0C) {
+ r = SC_ERROR_INVALID_ARGUMENTS;
+ sc_error(card->ctx, "Given APDU is already protected with some secure messaging");
+ goto err;
+ }
+
+ sc_copy_asn1_entry(c_sm_capdu, sm_capdu);
+
+ sm_apdu->sensitive = 0;
+ sm_apdu->control = apdu->control;
+ sm_apdu->flags = apdu->flags;
+ sm_apdu->cla = apdu->cla|0x0C;
+ sm_apdu->ins = apdu->ins;
+ sm_apdu->p1 = apdu->p1;
+ sm_apdu->p2 = apdu->p2;
+ r = format_head(ctx, sm_apdu, &mac_data);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not format header of SM apdu");
+ goto err;
+ }
+ mac_data_len = r;
+
+ /* get le and data depending on the case of the unsecure command */
+ switch (apdu->cse) {
+ case SC_APDU_CASE_1:
+ break;
+ case SC_APDU_CASE_2_SHORT:
+ le_len = 1;
+ r = format_le(apdu->le, sm_capdu + 1, &le, &le_len);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not format Le of SM apdu");
+ goto err;
+ }
+ if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "Protected Le (plain)", le, le_len);
+ break;
+ case SC_APDU_CASE_2_EXT:
+ if (card->slot->active_protocol == SC_PROTO_T0) {
+ /* T0 extended APDUs look just like short APDUs */
+ le_len = 1;
+ r = format_le(apdu->le, sm_capdu + 1, &le, &le_len);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not format Le of SM apdu");
+ goto err;
+ }
+ } else {
+ /* in case of T1 always use 3 bytes for length */
+ le_len = 3;
+ r = format_le(apdu->le, sm_capdu + 1, &le, &le_len);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not format Le of SM apdu");
+ goto err;
+ }
+ }
+ if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "Protected Le (plain)", le, le_len);
+ break;
+ case SC_APDU_CASE_3_SHORT:
+ case SC_APDU_CASE_3_EXT:
+ r = format_data(card, ctx, apdu->data, apdu->datalen,
+ sm_capdu + 0, &fdata, &fdata_len);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not format data of SM apdu");
+ goto err;
+ }
+ if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "Padding-content indicator followed by cryptogram (plain)",
+ fdata, fdata_len);
+ break;
+ case SC_APDU_CASE_4_SHORT:
+ /* in case of T0 no Le byte is added */
+ if (card->slot->active_protocol != SC_PROTO_T0) {
+ le_len = 1;
+ r = format_le(apdu->le, sm_capdu + 1, &le, &le_len);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not format Le of SM apdu");
+ goto err;
+ }
+ if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "Protected Le (plain)", le, le_len);
+ }
+
+ r = format_data(card, ctx, apdu->data, apdu->datalen,
+ sm_capdu + 0, &fdata, &fdata_len);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not format data of SM apdu");
+ goto err;
+ }
+ if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "Padding-content indicator followed by cryptogram (plain)",
+ fdata, fdata_len);
+ break;
+ case SC_APDU_CASE_4_EXT:
+ if (card->slot->active_protocol == SC_PROTO_T0) {
+ /* again a T0 extended case 4 APDU looks just
+ * like a short APDU, the additional data is
+ * transferred using ENVELOPE and GET RESPONSE */
+ } else {
+ /* only 2 bytes are use to specify the length of the
+ * expected data */
+ le_len = 2;
+ r = format_le(apdu->le, sm_capdu + 1, &le, &le_len);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not format Le of SM apdu");
+ goto err;
+ }
+ if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "Protected Le (plain)", le, le_len);
+ }
+
+ r = format_data(card, ctx, apdu->data, apdu->datalen,
+ sm_capdu + 0, &fdata, &fdata_len);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not format data of SM apdu");
+ goto err;
+ }
+ if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "Padding-content indicator followed by cryptogram (plain)",
+ fdata, fdata_len);
+ break;
+ default:
+ sc_error(card->ctx, "Unhandled apdu case");
+ r = SC_ERROR_INVALID_DATA;
+ goto err;
+ }
+
+
+ r = sc_asn1_encode(card->ctx, sm_capdu, (u8 **) &asn1, &asn1_len);
+ if (r < 0) {
+ goto err;
+ }
+ if (asn1_len) {
+ p = realloc(mac_data, mac_data_len + asn1_len);
+ if (!p) {
+ r = SC_ERROR_OUT_OF_MEMORY;
+ goto err;
+ }
+ mac_data = p;
+ /* Flawfinder: ignore */
+ memcpy(mac_data + mac_data_len, asn1, asn1_len);
+ mac_data_len += asn1_len;
+ r = add_padding(ctx, mac_data, mac_data_len, &mac_data);
+ if (r < 0) {
+ goto err;
+ }
+ mac_data_len = r;
+ }
+ if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "Data to authenticate", mac_data, mac_data_len);
+
+ r = ctx->authenticate(card, ctx, mac_data, mac_data_len,
+ &mac);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not get authentication code");
+ goto err;
+ }
+ mac_len = r;
+ sc_format_asn1_entry(sm_capdu + 2, mac, &mac_len,
+ SC_ASN1_PRESENT);
+ if (card->ctx->debug > SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "Cryptographic Checksum (plain)", mac, mac_len);
+
+
+ /* format SM apdu */
+ r = sc_asn1_encode(card->ctx, sm_capdu, (u8 **) &sm_data, &sm_data_len);
+ if (r < 0)
+ goto err;
+ if (sm_apdu->datalen < sm_data_len) {
+ sc_error(card->ctx, "Data for SM APDU too long");
+ r = SC_ERROR_OUT_OF_MEMORY;
+ goto err;
+ }
+ /* Flawfinder: ignore */
+ memcpy((u8 *) sm_apdu->data, sm_data, sm_data_len);
+ sm_apdu->datalen = sm_data_len;
+ sm_apdu->lc = sm_apdu->datalen;
+ sm_apdu->le = 0;
+ sm_apdu->cse = SC_APDU_CASE_4;
+ if (card->ctx->debug >= SC_LOG_TYPE_DEBUG)
+ bin_log(card->ctx, "ASN.1 encoded encrypted APDU data", sm_apdu->data, sm_apdu->datalen);
+
+err:
+ if (fdata)
+ free(fdata);
+ if (asn1)
+ free(asn1);
+ if (mac_data)
+ free(mac_data);
+ if (mac)
+ free(mac);
+ if (le)
+ free(le);
+ if (sm_data)
+ free(sm_data);
+
+ return r;
+}
+
+static int sm_decrypt(const struct sm_ctx *ctx, sc_card_t *card,
+ const sc_apdu_t *sm_apdu, sc_apdu_t *apdu)
+{
+ int r;
+ struct sc_asn1_entry sm_rapdu[4];
+ struct sc_asn1_entry my_sm_rapdu[4];
+ u8 sw[2], mac[8], fdata[SC_MAX_APDU_BUFFER_SIZE];
+ size_t sw_len = sizeof sw, mac_len = sizeof mac, fdata_len = sizeof fdata,
+ buf_len, asn1_len;
+ const u8 *buf;
+ u8 *data = NULL, *mac_data = NULL, *asn1 = NULL;
+
+ sc_copy_asn1_entry(c_sm_rapdu, sm_rapdu);
+ sc_format_asn1_entry(sm_rapdu + 0, fdata, &fdata_len, 0);
+ sc_format_asn1_entry(sm_rapdu + 1, sw, &sw_len, 0);
+ sc_format_asn1_entry(sm_rapdu + 2, mac, &mac_len, 0);
+
+ r = sc_asn1_decode(card->ctx, sm_rapdu, sm_apdu->resp, sm_apdu->resplen,
+ &buf, &buf_len);
+ if (r < 0)
+ goto err;
+ if (buf_len > 0) {
+ r = SC_ERROR_UNKNOWN_DATA_RECEIVED;
+ goto err;
+ }
+
+
+ if (sm_rapdu[2].flags & SC_ASN1_PRESENT) {
+ /* copy from sm_apdu to my_sm_apdu, but leave mac at default */
+ sc_copy_asn1_entry(sm_rapdu, my_sm_rapdu);
+ sc_copy_asn1_entry(&c_sm_rapdu[2], &my_sm_rapdu[2]);
+
+ r = sc_asn1_encode(card->ctx, my_sm_rapdu, &asn1, &asn1_len);
+ if (r < 0)
+ goto err;
+ r = add_padding(ctx, asn1, asn1_len, &mac_data);
+ if (r < 0) {
+ goto err;
+ }
+
+ r = ctx->verify_authentication(card, ctx, mac, mac_len,
+ mac_data, r);
+ if (r < 0)
+ goto err;
+ } else {
+ sc_error(card->ctx, "Cryptographic Checksum missing");
+ r = SC_ERROR_ASN1_OBJECT_NOT_FOUND;
+ goto err;
+ }
+
+
+ if (sm_rapdu[0].flags & SC_ASN1_PRESENT) {
+ if (ctx->padding_indicator != fdata[0]) {
+ r = SC_ERROR_UNKNOWN_DATA_RECEIVED;
+ goto err;
+ }
+ r = ctx->decrypt(card, ctx, fdata + 1, fdata_len - 1, &data);
+ if (r < 0)
+ goto err;
+ buf_len = r;
+
+ r = no_padding(ctx->padding_indicator, data, buf_len);
+ if (r < 0) {
+ sc_error(card->ctx, "Could not remove padding");
+ goto err;
+ }
+
+ if (apdu->resplen < r) {
+ sc_error(card->ctx, "Response of SM APDU too long");
+ r = SC_ERROR_OUT_OF_MEMORY;
+ goto err;
+ }
+ /* Flawfinder: ignore */
+ memcpy(apdu->resp, data, r);
+ apdu->resplen = r;
+ } else {
+ apdu->resplen = 0;
+ }
+
+ if (sm_rapdu[1].flags & SC_ASN1_PRESENT) {
+ if (sw_len != 2) {
+ sc_error(card->ctx, "Length of processing status bytes must be 2");
+ r = SC_ERROR_ASN1_END_OF_CONTENTS;
+ goto err;
+ }
+ apdu->sw1 = sw[0];
+ apdu->sw2 = sw[1];
+ } else {
+ sc_error(card->ctx, "Authenticated status bytes are missing");
+ r = SC_ERROR_ASN1_OBJECT_NOT_FOUND;
+ goto err;
+ }
+
+ if (card->ctx->debug >= SC_LOG_TYPE_DEBUG) {
+ sc_debug(card->ctx, "Decrypted APDU sw1=%02x sw2=%02x",
+ apdu->sw1, apdu->sw2);
+ bin_log(card->ctx, "Decrypted APDU response data",
+ apdu->resp, apdu->resplen);
+ }
+
+ r = SC_SUCCESS;
+
+err:
+ if (asn1) {
+ free(asn1);
+ }
+ if (mac_data) {
+ free(mac_data);
+ }
+
+ return r;
+}
+
+int sm_transmit_apdu(struct sm_ctx *sctx, sc_card_t *card,
+ sc_apdu_t *apdu)
+{
+ sc_apdu_t sm_apdu;
+ u8 rbuf[0xffff], sbuf[0xffff];
+
+ sm_apdu.data = sbuf;
+ sm_apdu.datalen = sizeof sbuf;
+ sm_apdu.resp = rbuf;
+ sm_apdu.resplen = sizeof rbuf;
+
+ if (!sctx || !sctx->active) {
+ sc_debug(card->ctx, "Secure messaging disabled.");
+ return sc_transmit_apdu(card, apdu);
+ }
+
+ if ((apdu->cla & 0x0C) == 0x0C) {
+ sc_debug(card->ctx, "Given APDU is already protected with some secure messaging. Deactivating own SM context.");
+ sctx->active = 0;
+ return sc_transmit_apdu(card, apdu);
+ }
+
+ if (sctx->pre_transmit)
+ SC_TEST_RET(card->ctx, sctx->pre_transmit(card, sctx, apdu),
+ "Could not complete SM specific pre transmit routine");
+ SC_TEST_RET(card->ctx, sm_encrypt(sctx, card, apdu, &sm_apdu),
+ "Could not encrypt APDU");
+ SC_TEST_RET(card->ctx, sc_transmit_apdu(card, &sm_apdu),
+ "Could not transmit SM APDU");
+ if (sctx->post_transmit)
+ SC_TEST_RET(card->ctx, sctx->post_transmit(card, sctx, &sm_apdu),
+ "Could not complete SM specific post transmit routine");
+ SC_TEST_RET(card->ctx, sm_decrypt(sctx, card, &sm_apdu, apdu),
+ "Could not decrypt APDU");
+
+ return SC_SUCCESS;
+}