VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

made pin puk can or mrz an optional command line argument

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@123 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-06-02 11:20:45 +00:00
parent 646e49ff1c
commit 975e8cb4d3
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ccid/src/pace-tool.c
View File

@@ -36,9 +36,13 @@ static u8 dotranslate = 0;
static const char *newpin = NULL; static const char *newpin = NULL;
static int usb_reader_num = -1; static int usb_reader_num = -1;
static const char *pin = NULL; static const char *pin = NULL;
static u8 usepin = 0;
static const char *puk = NULL; static const char *puk = NULL;
static u8 usepuk = 0;
static const char *can = NULL; static const char *can = NULL;
static u8 usecan = 0;
static const char *mrz = NULL; static const char *mrz = NULL;
static u8 usemrz = 0;
static const char *cdriver = NULL; static const char *cdriver = NULL;
static sc_context_t *ctx = NULL; static sc_context_t *ctx = NULL;
@@ -62,10 +66,10 @@ static const struct option options[] = {
{ "help", no_argument, NULL, OPT_HELP }, { "help", no_argument, NULL, OPT_HELP },
{ "reader", required_argument, NULL, OPT_READER }, { "reader", required_argument, NULL, OPT_READER },
{ "card-driver", required_argument, NULL, OPT_CARD }, { "card-driver", required_argument, NULL, OPT_CARD },
{ "pin", required_argument, NULL, OPT_PIN }, { "pin", optional_argument, NULL, OPT_PIN },
{ "puk", required_argument, NULL, OPT_PUK }, { "puk", optional_argument, NULL, OPT_PUK },
{ "can", required_argument, NULL, OPT_CAN }, { "can", optional_argument, NULL, OPT_CAN },
{ "mrz", required_argument, NULL, OPT_MRZ }, { "mrz", optional_argument, NULL, OPT_MRZ },
{ "new-pin", optional_argument, NULL, OPT_CHANGE_PIN }, { "new-pin", optional_argument, NULL, OPT_CHANGE_PIN },
{ "resume-pin", no_argument, NULL, OPT_RESUME_PIN }, { "resume-pin", no_argument, NULL, OPT_RESUME_PIN },
{ "translate", no_argument, NULL, OPT_TRANSLATE }, { "translate", no_argument, NULL, OPT_TRANSLATE },
@@ -214,15 +218,19 @@ main (int argc, char **argv)
doinfo++; doinfo++;
break; break;
case OPT_PUK: case OPT_PUK:
usepuk = 1;
puk = optarg; puk = optarg;
break; break;
case OPT_PIN: case OPT_PIN:
usepin = 1;
pin = optarg; pin = optarg;
break; break;
case OPT_CAN: case OPT_CAN:
usecan = 1;
can = optarg; can = optarg;
break; break;
case OPT_MRZ: case OPT_MRZ:
usemrz = 1;
mrz = optarg; mrz = optarg;
break; break;
case OPT_CHANGE_PIN: case OPT_CHANGE_PIN:
@@ -323,16 +331,16 @@ main (int argc, char **argv)
if (dotranslate || (!doresumepin && !dochangepin)) { if (dotranslate || (!doresumepin && !dochangepin)) {
enum s_type id; enum s_type id;
const char *s; const char *s;
if (pin) { if (usepin) {
id = PACE_PIN; id = PACE_PIN;
s = pin; s = pin;
} else if (can) { } else if (usecan) {
id = PACE_CAN; id = PACE_CAN;
s = can; s = can;
} else if (mrz) { } else if (usemrz) {
id = PACE_MRZ; id = PACE_MRZ;
s = mrz; s = mrz;
} else if (puk) { } else if (usepuk) {
id = PACE_PUK; id = PACE_PUK;
s = puk; s = puk;
} else { } else {