Basic support for EAC documents (e.g. German Identification Card)

-new files armsrc/epa.[ch] for ePA (electronic "Personalausweis") related functions
    -Offers elementary functions (EPA_PACE_MSE_Set_AT etc.)
    -Also offers one new USB command: EPA_PACE_Collect_Nonce
-created new command subtree in client: client/hfepa.[ch] ("hf epa")
    -offers "hf epa cnonces" (collect encrypted PACE nonces)
-more to come

client/Makefile

@@ -56,6 +56,7 @@ CMDSRCS = \
 			cmdhf14a.c \
 			cmdhf14b.c \
 			cmdhf15.c \
+			cmdhfepa.c \
 			cmdhflegic.c \
 			cmdhficlass.c \
 			cmdhfmf.c \

client/cmdhf.c

@@ -17,6 +17,7 @@
 #include "cmdhf14a.h"
 #include "cmdhf14b.h"
 #include "cmdhf15.h"
+#include "cmdhfepa.h"
 #include "cmdhflegic.h"
 #include "cmdhficlass.h"
 #include "cmdhfmf.h"
@@ -36,6 +37,7 @@ static command_t CommandTable[] =
   {"14a",         CmdHF14A,         1, "{ ISO14443A RFIDs... }"},
   {"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs... }"},
   {"15",          CmdHF15,          1, "{ ISO15693 RFIDs... }"},
+  {"epa",         CmdHFEPA,         1, "{ German Identification Card... }"},
   {"legic",       CmdHFLegic,       0, "{ LEGIC RFIDs... }"},
   {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs... }"},
   {"mf",      		CmdHFMF,		      1, "{ MIFARE RFIDs... }"},

client/cmdhf14a.c

@@ -463,12 +463,12 @@ int CmdHF14ASnoop(const char *Cmd) {
 
 static command_t CommandTable[] = 
 {
-  {"help",   CmdHelp,          1, "This help"},
-  {"list",   CmdHF14AList,     0, "List ISO 14443a history"},
-  {"reader", CmdHF14AReader,   0, "Act like an ISO14443 Type A reader"},
-  {"cuids",  CmdHF14ACUIDs,    0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},
-  {"sim",    CmdHF14ASim,      0, "<UID> -- Fake ISO 14443a tag"},
-  {"snoop",  CmdHF14ASnoop,    0, "Eavesdrop ISO 14443 Type A"},
+  {"help",   CmdHelp,              1, "This help"},
+  {"list",   CmdHF14AList,         0, "List ISO 14443a history"},
+  {"reader", CmdHF14AReader,       0, "Act like an ISO14443 Type A reader"},
+  {"cuids",  CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},
+  {"sim",    CmdHF14ASim,          0, "<UID> -- Fake ISO 14443a tag"},
+  {"snoop",  CmdHF14ASnoop,        0, "Eavesdrop ISO 14443 Type A"},
   {NULL, NULL, 0, NULL}
 };
 

client/cmdhfepa.c

@@ -0,0 +1,89 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2012 Frederik Möllers
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Commands related to the German electronic Identification Card
+//-----------------------------------------------------------------------------
+
+#include "util.h"
+#include "proxusb.h"
+#include "ui.h"
+#include "cmdparser.h"
+#include "common.h"
+#include "cmdmain.h"
+
+#include "cmdhfepa.h"
+
+static int CmdHelp(const char *Cmd);
+
+// Perform (part of) the PACE protocol
+int CmdHFEPACollectPACENonces(const char *Cmd)
+{
+	// requested nonce size
+	uint8_t m = 0;
+	// requested number of Nonces
+	unsigned int n = 0;
+	
+	sscanf(Cmd, "%hhu %u", &m, &n);
+	
+	// values are expected to be > 0
+	m = m > 0 ? m : 1;
+	n = n > 0 ? n : 1;
+
+	PrintAndLog("Collecting %u %hhu-byte nonces", n, m);
+	PrintAndLog("Start: %u", time(NULL));
+	// repeat n times
+	for (unsigned int i = 0; i < n; i++) {
+		// execute PACE
+		UsbCommand c = {CMD_EPA_PACE_COLLECT_NONCE, {(int)m, 0, 0}};
+		SendCommand(&c);
+		UsbCommand *resp = WaitForResponse(CMD_ACK);
+
+		// check if command failed
+		if (resp->arg[0] != 0) {
+			PrintAndLog("Error in step %d, Return code: %d",
+			            resp->arg[0],
+						(int)resp->arg[1]);
+		} else {
+			size_t nonce_length = resp->arg[1];
+			char *nonce = (char *) malloc(2 * nonce_length + 1);
+			for(int j = 0; j < nonce_length; j++) {
+				snprintf(nonce + (2 * j), 3, "%02X", resp->d.asBytes[j]);
+			}
+			// print nonce
+			PrintAndLog("Length: %d, Nonce: %s",
+			            resp->arg[1], nonce);
+		}
+	}
+	PrintAndLog("End: %u", time(NULL));
+
+	return 1;
+}
+
+// UI-related stuff
+
+static const command_t CommandTable[] = 
+{
+  {"help",    CmdHelp,                   1, "This help"},
+  {"cnonces", CmdHFEPACollectPACENonces, 0, "<m> <n> Acquire n>0 encrypted PACE nonces of size m>0"},
+  {NULL, NULL, 0, NULL}
+};
+
+int CmdHelp(const char *Cmd)
+{
+  CmdsHelp(CommandTable);
+  return 0;
+}
+
+int CmdHFEPA(const char *Cmd)
+{
+	// flush
+	while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;
+
+	// parse
+  CmdsParse(CommandTable, Cmd);
+  return 0;
+}

client/cmdhfepa.h

@@ -0,0 +1,18 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2012 Frederik Möllers
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Commands related to the German electronic Identification Card
+//-----------------------------------------------------------------------------
+
+#ifndef CMDHFEPA_H__
+#define CMDHFEPA_H__
+
+int CmdHFEPA(const char *Cmd);
+
+int CmdHFEPACollectPACENonces(const char *Cmd);
+
+#endif // CMDHFEPA_H__